Skip to content

⚠️ CONFLICT! Lineage pull request for: skeleton#271

Merged
jsf9k merged 71 commits intodevelopfrom
lineage/skeleton
May 5, 2026
Merged

⚠️ CONFLICT! Lineage pull request for: skeleton#271
jsf9k merged 71 commits intodevelopfrom
lineage/skeleton

Conversation

@cisagovbot
Copy link
Copy Markdown

@cisagovbot cisagovbot commented May 1, 2026

Lineage Pull Request: CONFLICT

Achtung!!!

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/guacscanner.git guacscanner
    cd guacscanner
    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 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

dependabot Bot and others added 30 commits December 15, 2025 18:26
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
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.
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label May 1, 2026
Comment thread src/example/example.py Fixed
@github-actions github-actions Bot added dependencies Pull requests that update a dependency file python Pull requests that update Python code github-actions Pull requests that update GitHub Actions code test This issue or pull request adds or otherwise modifies test code shell script Pull requests that update shell scripts labels May 1, 2026
@coveralls
Copy link
Copy Markdown

Coverage Report for CI Build 25197989343

Coverage remained the same at 79.874%

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

Coverage Status
Relevant Lines: 290
Covered Lines: 228
Line Coverage: 78.62%
Relevant Branches: 28
Covered Branches: 26
Branch Coverage: 92.86%
Branches in Coverage %: Yes
Coverage Strength: 15.64 hits per line

💛 - Coveralls

@jsf9k jsf9k force-pushed the lineage/skeleton branch from 2d79fee to 6dd0ae8 Compare May 4, 2026 19:48
jsf9k added 3 commits May 4, 2026 15:58
This fixes a host of errors from our flake8 pre-commit linter.
This was tripping up docopt and causing an error.
@jsf9k jsf9k marked this pull request as ready for review May 5, 2026 15:31
Copilot AI review requested due to automatic review settings May 5, 2026 15:31
@jsf9k jsf9k requested review from dav3r, felddy and mcdonnnj as code owners May 5, 2026 15:31
@jsf9k jsf9k enabled auto-merge May 5, 2026 15:31
@jsf9k jsf9k requested a review from a team May 5, 2026 15:32
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 explicit wheel installation from bootstrap steps.
  • Reformat comments, docstrings, and long strings in src/guacscanner/guacscanner.py without 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.

Comment thread .pre-commit-config.yaml
Comment thread .github/dependabot.yml
Comment thread .github/workflows/build.yml
Copy link
Copy Markdown
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@jsf9k jsf9k merged commit de9f926 into develop May 5, 2026
158 of 159 checks passed
@jsf9k jsf9k deleted the lineage/skeleton branch May 5, 2026 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file github-actions Pull requests that update GitHub Actions code python Pull requests that update Python code shell script Pull requests that update shell scripts test This issue or pull request adds or otherwise modifies test code upstream update This issue or pull request pulls in upstream updates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants