⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an
upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-python-library.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with
your project.

The lineage/skeleton branch has one or more unresolved merge conflicts
that you must resolve before merging this pull request!

How to resolve the conflicts

1. Take ownership of this pull request by removing any other assignees.

2. Clone the repository locally, and reapply the merge:

   git clone [email protected]:cisagov/trustymail.git trustymail
   cd trustymail
   git remote add skeleton https://github.com/cisagov/skeleton-python-library.git
   git remote set-url --push skeleton no_push
   git switch develop
   git switch --create lineage/skeleton --track origin/develop
   git pull skeleton HEAD
   git status

3. Review the changes displayed by the status command. Fix any conflicts and
   possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the
   branch, commit, and push your changes:

   git add .github/dependabot.yml src/trustymail/__init__.py src/trustymail/_version.py 
   git commit
   git push --force --set-upstream origin lineage/skeleton

   Note that you may append to the default merge commit message
   that git creates for you, but please do not delete the existing
   content. It provides useful information about the merge that is
   being performed.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All new and existing tests pass.

✅ Pre-merge checklist

• Bump major, minor, patch, or pre-release version as appropriate via the bump_version.sh script if this repository is versioned and the changes in this PR warrant a version bump.
• Finalize version.
• Remove Python 3.6 GitHub Actions checks.

✅ Post-merge checklist

• Create a release.

---

Note

You are seeing this because one of this repository's maintainers has
configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

[dv4harr10]

Hi Team @ALL , just one question for trustymail/Dockerfile line 5 has a pip reference to setuptools. I'm just curious if it's ok to keep setuptools in this RUN pip install statement ? Since there was a conflict with the package install in the gophish-tools PR. I figure this is a non-issue since the most updated version should be used, just wanted to confirm.

[jsf9k]

Hi Team @ALL , just one question for trustymail/Dockerfile line 5 has a pip reference to setuptools. I'm just curious if it's ok to keep setuptools in this RUN pip install statement ? Since there was a conflict with the package install in the gophish-tools PR. I figure this is a non-issue since the most updated version should be used, just wanted to confirm.

@dv4harr10 - It's OK to keep setuptools in this statement. cisagov/ansible-role-gophish-tools is a special case because gophish is ancient and requires an ancient version of setuptools.