⚠️ 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 git@github.com:cisagov/cyhy-config.git cyhy-config
   cd cyhy-config
   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 src/example/example.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 relevant repo and/or project documentation has been updated to reflect the changes in this PR.
• 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

[Copilot]

Pull request overview

This PR pulls in upstream skeleton maintenance updates for the repository’s Python packaging, pre-commit tooling, and GitHub Actions automation. The changes mostly align this repo with newer skeleton conventions and dependency management patterns.

Changes:

• Refreshes CI and repository automation workflows, including action version bumps and job renaming in build.yml.
• Updates development/tooling configuration in .pre-commit-config.yaml, pyproject.toml, requirements.txt, and setup-env.
• Applies minor documentation/comment formatting updates in tests and README.md.

Reviewed changes

Copilot reviewed 11 out of 12 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
tests/test_cyhy_config.py	Shortens several test docstrings without changing test behavior.
setup-env	Stops upgrading/installing wheel during local environment setup.
requirements.txt	Updates packaging guidance to pyproject.toml and removes wheel.
README.md	Normalizes markdown table formatting.
pyproject.toml	Expands Flake8 rule selection and ignore configuration comments.
.pre-commit-config.yaml	Bumps many hook versions and adds new Flake8/Terraform-related tooling.
.github/workflows/sync-labels.yml	Updates the repository-label sync action version.
.github/workflows/label-prs.yml	Switches PR trigger config to default pull_request activity types.
.github/workflows/dependency-review.yml	Adds explanatory comment for default PR trigger behavior.
.github/workflows/codeql-analysis.yml	Adds explanatory comment for default PR trigger behavior.
.github/workflows/build.yml	Updates action versions, cache keys, Terraform docs branch, and renames build/test jobs.
.github/dependabot.yml	Adjusts Dependabot grouping/ignore rules for GitHub Actions and pip dependencies.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.