⚠️ 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-logging.git cyhy-logging
   cd cyhy-logging
   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.
• Tests have been added and/or modified to cover 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

[coveralls]

Coverage Report for CI Build 25198131969

Coverage remained the same at 100.0%

Details

• Coverage remained the same as the base build.
• Patch coverage: No coverable lines changed in this PR.
• No coverage regressions found.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

No coverage regressions found.

---

Coverage Stats

Relevant Lines:	45
Covered Lines:	45
Line Coverage:	100.0%
Relevant Branches:	6
Covered Branches:	6
Branch Coverage:	100.0%
Branches in Coverage %:	Yes
Coverage Strength:	12.0 hits per line

---

💛 - Coveralls

[Copilot]

Pull request overview

This PR brings this repository back in sync with the upstream skeleton-python-library template, primarily updating developer tooling and CI configuration while making small formatting-only adjustments in a few Python/test files.

Changes:

• Updates CI workflows (job naming, caching keys, action versions) and Dependabot grouping/ignore settings.
• Refreshes pre-commit hook versions and expands Flake8 plugin configuration in pyproject.toml.
• Applies line-wrapping/formatting tweaks in tests and logging filter code.

Reviewed changes

Copilot reviewed 12 out of 13 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
tests/test_log_filters.py	Wraps long test strings for lint/formatting compliance.
src/cyhy_logging/log_filters.py	Wraps docstrings/comments and refactors a long f-string into a parenthesized return.
src/cyhy_logging/__init__.py	Adjusts Flake8 suppression comments/markers around __version__ import.
setup-env	Stops upgrading/installing wheel during environment setup.
requirements.txt	Updates guidance comment to reference pyproject.toml dependencies; removes wheel requirement.
pyproject.toml	Expands Flake8 configuration (more selected code families, updated ignore commentary).
.pre-commit-config.yaml	Bumps hook versions and adds Flake8 plugin dependencies; extends pip-audit args.
.github/workflows/sync-labels.yml	Updates label sync action major version.
.github/workflows/label-prs.yml	Uses default pull_request activity types; adds explanatory comment.
.github/workflows/dependency-review.yml	Adds comment noting default pull_request activity types.
.github/workflows/codeql-analysis.yml	Adds comment noting default pull_request activity types.
.github/workflows/build.yml	Updates caching/action versions, renames jobs, adjusts cache keys and build/test flow.
.github/dependabot.yml	Adds grouping for upload/download-artifact and expands ignored pip dependencies.

Comments suppressed due to low confidence (1)

src/cyhy_logging/log_filters.py:62

• logging.Filter.filter() is expected to return a boolean; the logging framework ignores any returned LogRecord. Because this implementation copies the record and returns the copy, the handler will continue emitting the original (unredacted) record when this filter is attached via handler.addFilter(...) (as done in setup_logging). Update the filter to mutate record.msg/record.args in place (or otherwise ensure the emitted record is modified) and return True, and adjust the return type/docstring/tests accordingly.

        # Create a shallow copy of the record only if modification is needed
        new_record = copy.copy(record)

        # Update the message and clear args since we are directly
        # setting the final message
        new_record.msg = redacted_message
        new_record.args = None

        return new_record

---

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

[jsf9k]

The presence of # noqa: F401 was precisely what flake8 complained about, which led me to make the change.

[jsf9k]

Please see cisagov/skeleton-python-library#190.