⚠️ 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-generic.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 git@github.com:cisagov/skeleton-python-library.git skeleton-python-library
   cd skeleton-python-library
   git remote add skeleton https://github.com/cisagov/skeleton-generic.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 version.txt 
   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.

---

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

[jsf9k]

@mcdonnnj - Do you know why the five Coveralls checks aren't being run?

[mcdonnnj]

@mcdonnnj - Do you know why the five Coveralls checks aren't being run?

I made #156 to see if that would help, but I think we might be running into lemurheavy/coveralls-public#1819.

[jsf9k]

@mcdonnnj - Do you know why the five Coveralls checks aren't being run?

I made #156 to see if that would help, but I think we might be running into lemurheavy/coveralls-public#1819.

Thank you for looking into that. Since other folks say that the issue is intermittent I will try to re-run the checks and get it to pass, even though I'm seeing this very consistently though.

I will go ahead and re-enable the Lineage action before I leave for the day. The other skeletons are all ready to go, so I may as well get started on them.