⚠️ CONFLICT! Lineage pull request for: skeleton#271
Merged
Conversation
Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v4...v5) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
The `pull_request` trigger's default activity types are `opened`, `reopened`, and `synchronized`. These types better represent when we want this workflow to run and the `edited` type was resulting in undesired workflow runs.
This is done automatically with the `pre-commit autoupdate` command.
The latest release supports the artifact-metadata permission that we are now using in the generate-sbom job of the build.yml GitHub Actions workflow in cisagov/skeleton-aws-lambda-python, cisagov/skeleton-docker, and cisagov/skeleton-python-library.
This will return the cache key to being a string with no new lines.
It is no longer necessary to install wheel alongside setuptools as of setuptools v70.1: https://github.com/pypa/wheel?tab=readme-ov-file#historical-note
This is done automatically with the pre-commit autoupdate command.
We rely on the default activity types for the pull_request event in our GitHub Actions workflows. This adds a comment mentioning that we do so and linking to the GitHub documentation for the event which details the specific activity types that are used by default. Co-authored-by: dav3r <david.redmin@gwe.cisa.dhs.gov>
This is done automatically with the pre-commit autoupdate command.
Remove installation of `wheel` Python package
…s/cache-5 Bump actions/cache from 4 to 5
…ggers Adjust the activity types for the `pull_request` trigger in the `Label pull requests` workflow
…ting Adjust the `lint` job of the `build` workflow's cache key formatting
Update `pre-commit` hook versions
Now that I have two pull requests out for changes relevant to our work it makes sense to use a branch that consolidates any changes we need.
It is no longer necessary to install wheel alongside setuptools as of setuptools v70.1.
We need to update the comment about using a branch of mcdonnnj's terraform-docs fork to reflect that a second PR with different functionality is now included in the branch. Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
…s_branch Change the branch we use for installing terraform-docs
Bumps [crazy-max/ghaction-github-labeler](https://github.com/crazy-max/ghaction-github-labeler) from 5 to 6. - [Release notes](https://github.com/crazy-max/ghaction-github-labeler/releases) - [Commits](crazy-max/ghaction-github-labeler@v5...v6) --- updated-dependencies: - dependency-name: crazy-max/ghaction-github-labeler dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 3 to 4. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](hashicorp/setup-terraform@v3...v4) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
This warning contradicts the Black style so it must be ignored.
Make the ignore commenting consistent with the select commenting. Break up each comment/directive with an empty line.
This adds the flake8-bugbear plugin to our pre-commit configuration. Note that flake8 is already configured to use this plugin's warnings.
Add the dlint plugin to our flake8 configuration for pre-commit. Update the flake8 configuration to select these new warnings.
Add the flake8-noqa plugin to the flake8 portion of our pre-commit configuration. Update the flake8 configuration to select these new warnings.
Coverage Report for CI Build 25197989343Coverage remained the same at 79.874%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsNo coverage regressions found. Coverage Stats
💛 - Coveralls |
This fixes a host of errors from our flake8 pre-commit linter.
This was tripping up docopt and causing an error.
jsf9k
approved these changes
May 5, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This Lineage sync pulls in upstream skeleton-python-library maintenance updates for packaging, CI, and repository automation. In this codebase, those changes mostly modernize workflow/tooling configuration while keeping the application logic in guacscanner functionally the same.
Changes:
- Refresh GitHub Actions, pre-commit hooks, and Dependabot configuration to newer upstream skeleton settings.
- Move packaging references fully to
pyproject.toml, including cache-key updates and removal of explicitwheelinstallation from bootstrap steps. - Reformat comments, docstrings, and long strings in
src/guacscanner/guacscanner.pywithout changing behavior.
Reviewed changes
Copilot reviewed 10 out of 11 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
src/guacscanner/guacscanner.py |
Reflows docstrings, log messages, SQL strings, and help text formatting. |
setup-env |
Removes explicit wheel upgrade during local environment setup. |
requirements.txt |
Updates the dependency note to reference pyproject.toml and drops wheel. |
pyproject.toml |
Expands documented flake8 rule selections and ignore settings. |
.pre-commit-config.yaml |
Bumps hook versions and adds new lint/audit hook dependencies and arguments. |
.github/workflows/sync-labels.yml |
Updates the repository-label sync action version. |
.github/workflows/label-prs.yml |
Simplifies pull request trigger configuration to use default event types. |
.github/workflows/dependency-review.yml |
Adds documentation comments around default pull_request trigger behavior. |
.github/workflows/codeql-analysis.yml |
Adds documentation comments around default pull_request trigger behavior. |
.github/workflows/build.yml |
Updates cache keys, action versions, terraform-docs branch selection, and renames build/test jobs. |
.github/dependabot.yml |
Adjusts grouped/ignored dependency update rules for GitHub Actions and pip ecosystems. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.gitRemote branch:
HEADCheck the changes in this pull request to ensure they won't cause issues with your project.
The
lineage/skeletonbranch has one or more unresolved merge conflicts that you must resolve before merging this pull request!How to resolve the conflicts
Take ownership of this pull request by removing any other assignees.
Clone the repository locally, and reapply the merge:
Review the changes displayed by the
statuscommand. Fix any conflicts and possibly incorrect auto-merges.After resolving each of the conflicts,
addyour changes to the branch,commit, andpushyour changes: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.
Wait for all the automated tests to pass.
Confirm each item in the "Pre-approval checklist" below.
Remove any of the checklist items that do not apply.
Ensure every remaining checkbox has been checked.
Mark this draft pull request "Ready for review".
✅ Pre-approval checklist
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