⚠️ CONFLICT! Lineage pull request for: skeleton by cisagovbot · Pull Request #266 · cisagov/pshtt

cisagovbot · 2026-05-01T01:36:48Z

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

Take ownership of this pull request by removing any other assignees.

Clone the repository locally, and reapply the merge:

git clone git@github.com:cisagov/pshtt.git pshtt
cd pshtt
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

Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.
After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:
```
git add .pre-commit-config.yaml pyproject.toml 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.
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

✌️ The conflicts in this pull request have been resolved.
All future TODOs are captured in issues, which are referenced in code comments.
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

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.

…config

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.

pshtt supports Python 3.7-3.10, so we can run pre-commit under Python 3.10.

This code only runs in Python 3. Thanks to our pyupgrade pre-commit linter for noticing this.

This gets rid of a bunch of B950 errors from our flake8 pre-commit linter.

This gets rid of three C416 errors from our flake8 pre-commit linter.

There is no violation on this line, and removing this comment gets rid of a NQA101 error from our flake8 pre-commit hook.

Our flake8 pre-commit linter gives that error when possibly allowing insecure connections, but that is the intent.

We don't really need this hook for pshtt, and it fails to be set up in the runners. It does run successfully locally. :gallic_shrug:

dependabot Bot and others added 30 commits December 15, 2025 18:26

Remove itemized pull_request trigger types

ce44624

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.

Update pre-commit hook versions

9c0d2b6

This is done automatically with the `pre-commit autoupdate` command.

Adjust the build workflow's cache key formatting

77f204a

This will return the cache key to being a string with no new lines.

Remove installation of wheel Python package

2fb5133

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

Update pre-commit hook versions

6b9b731

This is done automatically with the pre-commit autoupdate command.

Update pre-commit hook versions

57ee431

This is done automatically with the pre-commit autoupdate command.

Merge pull request #249 from cisagov/improvement/remove-wheel

7d62b5e

Remove installation of `wheel` Python package

Merge pull request #244 from cisagov/dependabot/github_actions/action…

9eac052

…s/cache-5 Bump actions/cache from 4 to 5

Merge pull request #245 from cisagov/improvement/adjust_label-prs_tri…

fe7eb42

…ggers Adjust the activity types for the `pull_request` trigger in the `Label pull requests` workflow

Merge pull request #247 from cisagov/improvement/fix_cache_key_format…

ace1712

…ting Adjust the `lint` job of the `build` workflow's cache key formatting

Merge pull request #246 from cisagov/maintenance/update_pre-commit_hooks

6ae498b

Update `pre-commit` hook versions

Change the branch used for terraform-docs

44f5b28

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.

Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton

b7f47cd

Ensure that the same version of bandit is used throughout pre-commit …

8574634

…config

Upgrade actions/cache to match version used in parent skeleton

a4ad9c6

Remove installation of wheel alongside setuptools

60fcea1

It is no longer necessary to install wheel alongside setuptools as of setuptools v70.1.

Fix some dangling references to setup.py

53f9b5f

Clean up definitions of cache keys to match upstream

eac3451

Update comment in the build workflow

4991be5

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>

Merge pull request #250 from cisagov/improvement/change_terraform-doc…

5df67a7

…s_branch Change the branch we use for installing terraform-docs

Add E203 to ignore list for flake8

2c37bcc

This warning contradicts the Black style so it must be ignored.

Reformat .flake8 configuration

0f44a77

Make the ignore commenting consistent with the select commenting. Break up each comment/directive with an empty line.

Add the flake8-bugbear plugin

57ce573

This adds the flake8-bugbear plugin to our pre-commit configuration. Note that flake8 is already configured to use this plugin's warnings.

Add dlint plugin for flake8

d1356e9

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 for flake8

0fd3256

Add the flake8-noqa plugin to the flake8 portion of our pre-commit configuration. Update the flake8 configuration to select these new warnings.

github-actions Bot added 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

jsf9k unassigned IanLee1521, felddy, dav3r and mcdonnnj May 12, 2026

jsf9k added this to CyHy System and BOD 18-01 May 12, 2026

github-project-automation Bot moved this to In progress in BOD 18-01 May 12, 2026

jsf9k moved this to In Progress in CyHy System May 12, 2026

jsf9k added 2 commits May 12, 2026 14:46

Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton

e4c726f

Uncomment new Dependabot ignore directives from upstream

1ec0e95

jsf9k force-pushed the lineage/skeleton branch from 7ff1bae to 1ec0e95 Compare May 12, 2026 18:54

jsf9k added 7 commits June 17, 2026 13:45

Update pre-commit config to use upstream versions where possible

e6c381f

pshtt supports Python 3.7-3.10, so we can run pre-commit under Python 3.10.

Remove Python 2/3 version check

a86a599

This code only runs in Python 3. Thanks to our pyupgrade pre-commit linter for noticing this.

Fix several overly long lines

c12e326

This gets rid of a bunch of B950 errors from our flake8 pre-commit linter.

Remove unnecessary list comprehensions

323e1e9

This gets rid of three C416 errors from our flake8 pre-commit linter.

Get rid of a needless noqa comment

792d113

There is no violation on this line, and removing this comment gets rid of a NQA101 error from our flake8 pre-commit hook.

Add noqa comment for DUO131

2d2018f

Our flake8 pre-commit linter gives that error when possibly allowing insecure connections, but that is the intent.

Comment out ansible-lint hook

b1999b4

We don't really need this hook for pshtt, and it fails to be set up in the runners. It does run successfully locally. :gallic_shrug:

jsf9k moved this from In progress to Review in progress in BOD 18-01 Jun 17, 2026

jsf9k marked this pull request as ready for review June 17, 2026 18:38

jsf9k requested review from IanLee1521, dav3r, felddy, jsf9k and mcdonnnj as code owners June 17, 2026 18:38

jsf9k enabled auto-merge June 17, 2026 18:38

jsf9k approved these changes Jun 17, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

⚠️ CONFLICT! Lineage pull request for: skeleton#266
cisagovbot wants to merge 75 commits into
developfrom
lineage/skeleton

cisagovbot commented May 1, 2026 •

edited by jsf9k

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

cisagovbot commented May 1, 2026 • edited by jsf9k Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

cisagovbot commented May 1, 2026 •

edited by jsf9k

Loading