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

cisagovbot · 2025-11-19T00:46:28Z

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-generic.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 [email protected]:cisagov/skeleton-tf-module.git skeleton-tf-module
cd skeleton-tf-module
git remote add skeleton https://github.com/cisagov/skeleton-generic.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 README.md 
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 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

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v3...v4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

There should be no reason for the actions/labeler action to create new labels so we can remove the permission that would allow this to occur.

This updates the existing color, which was pulled from the Python logo, to the color used in the Python website's CSS for the "Python" item in the site's top menu.

This reflects the value defined by JSConf and used in their unofficially official logo for JS.

This reflects the color of the logo from the TypeScript branding page at https://www.typescriptlang.org/branding/.

This mirrors the value used as a background for the mango Ansible community mark logo found in the ansible/logos repository.

This is the "Moby Blue" primary color as defined in the Docker brand guidelines color section found at https://www.docker.com/company/newsroom/media-resources/.

Since we use shell scripts throughout our projects it makes sense to have a dedicated label.

Co-authored-by: dav3r <[email protected]>

We can configure all our Python tooling in a single pyproject.toml file. Note that using pyproject.toml to configure flake8 requires the addition of the flake8-pyproject Python library.

…mmit hook This will ensure that, even when run as a pre-commit hook, flake8 reads its configuration from the pyproject.toml file.

Also remove .flake8 and .isort.cfg as triggers for the same label.

This file was doing nothing due to its contents.

The flake8-docstrings dependency is pinned, so this one should be too.

flake8 itself isn't installed here, so this dependency shouldn't be either. This jibes with the fact that we don't install flake8-docstrings (another dependency of the flake8 pre-commit hook) into the virtual environment either.

…ission Remove an unnecessary permission from the PR label workflow

Add a license badge

Update some label color choices

…ion_for_shell_scripts Add a label and auto-label configuration for shell scripts

…o-pyproject-toml Move all Python tool configs to `pyproject.toml`

Upgrade `pre-commit` hooks via `pre-commit autoupdate`

…/codeql-action-4 Bump github/codeql-action from 3 to 4

We added a CodeQL configuration in #202 but did not add a badge.

Add a CodeQL badge to the README

The 1.9.0 release of Bandit was flawed due to a failure of the GHA workflows that publish to PyPI and Test PyPI. The 1.9.1 release resolved the issue.

Update `bandit` `pre-commit` hook

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

This is necessary for cisagov/skeleton-ansible-role#243 (Fedora 43 support). See here for more details about this release: https://github.com/ansible/ansible-lint/releases/tag/v25.11.1

Python 3.10 is currently the oldest non-EOL version of Python, so we want to apply all rules that apply to this version or later. See here for more details: https://www.gyford.com/phil/writing/2025/08/26/how-to-use-pyupgrade/

ansible-core<2.17.7 suffers from GHSA-99w6-3xph-cx78.

…pgrade Add `--py310-plus` argument to `pyupgrade` `pre-commit` hook

…-pre-commit-hook Upgrade the `ansible-lint` `pre-commit` hook

…s/checkout-6 Bump actions/checkout from 5 to 6

Pin `ansible-core` to 2.17.7 or later

dependabot bot and others added 30 commits October 13, 2025 18:01

Remove an unnecessary permission from the PR label workflow

a44c47d

There should be no reason for the actions/labeler action to create new labels so we can remove the permission that would allow this to occur.

Add a license badge

629a0cc

Update the color used for the python label

e133119

This updates the existing color, which was pulled from the Python logo, to the color used in the Python website's CSS for the "Python" item in the site's top menu.

Update the color used for the javascript label

15771ca

This reflects the value defined by JSConf and used in their unofficially official logo for JS.

Update the color used for the typescript label

a7eeb15

This reflects the color of the logo from the TypeScript branding page at https://www.typescriptlang.org/branding/.

Update the color used for the ansible label

fb7a736

This mirrors the value used as a background for the mango Ansible community mark logo found in the ansible/logos repository.

Update the color used for the docker label

5503151

This is the "Moby Blue" primary color as defined in the Docker brand guidelines color section found at https://www.docker.com/company/newsroom/media-resources/.

Add a label and auto-label configuration for shell scripts

dc0d9a0

Since we use shell scripts throughout our projects it makes sense to have a dedicated label.

Remove needless blank line

586af7c

Improve a labeler configuration's explanatory comment

8b5f6d2

Co-authored-by: dav3r <[email protected]>

Rename .flake8 to pyproject.toml and update syntax

ad708bd

We can configure all our Python tooling in a single pyproject.toml file. Note that using pyproject.toml to configure flake8 requires the addition of the flake8-pyproject Python library.

Add flake8-pyproject as an additional dependency of the flake8 pre-co…

2a3bb8b

…mmit hook This will ensure that, even when run as a pre-commit hook, flake8 reads its configuration from the pyproject.toml file.

Move isort config to pyproject.toml file

a70cf3c

Add pyproject.toml as a trigger for the test label

c1861e6

Also remove .flake8 and .isort.cfg as triggers for the same label.

Remove the .bandit.yml file

22c6f40

This file was doing nothing due to its contents.

Pin the flake8-pyproject dependency in the pre-commit configuration

15cb601

The flake8-docstrings dependency is pinned, so this one should be too.

Upgrade pre-commit hooks via pre-commit autoupdate

c7c0c0a

Merge pull request #227 from cisagov/improvement/remove_unneeded_perm…

056d2e1

…ission Remove an unnecessary permission from the PR label workflow

Merge pull request #228 from cisagov/documentation/add-license-badge

895ff4f

Add a license badge

Merge pull request #229 from cisagov/improvement/update_label_colors

049543f

Update some label color choices

Merge pull request #231 from cisagov/improvement/add_label_configurat…

be1d94a

…ion_for_shell_scripts Add a label and auto-label configuration for shell scripts

Merge pull request #235 from cisagov/improvement/move-flake8-config-t…

4a1bb4d

…o-pyproject-toml Move all Python tool configs to `pyproject.toml`

Merge pull request #237 from cisagov/improvement/update-pre-commit-hooks

eed01ea

Upgrade `pre-commit` hooks via `pre-commit autoupdate`

Merge pull request #226 from cisagov/dependabot/github_actions/github…

8cb611d

…/codeql-action-4 Bump github/codeql-action from 3 to 4

Add a CodeQL badge to the README

2d88e72

We added a CodeQL configuration in #202 but did not add a badge.

Merge pull request #230 from cisagov/improvement/add_codeql_badge

7f52b02

Add a CodeQL badge to the README

Update Bandit pre-commit hook

2759cc5

The 1.9.0 release of Bandit was flawed due to a failure of the GHA workflows that publish to PyPI and Test PyPI. The 1.9.1 release resolved the issue.

Merge pull request #238 from cisagov/improvement/update-bandit

f186c74

Update `bandit` `pre-commit` hook

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Nov 19, 2025

github-actions bot added documentation This issue or pull request improves or adds to documentation dependencies Pull requests that update a dependency file github-actions Pull requests that update GitHub Actions code labels Nov 19, 2025

jsf9k unassigned dav3r and mcdonnnj Nov 19, 2025

jsf9k added the kraken 🐙 This pull request is ready to merge during the next Lineage Kraken release label Nov 19, 2025

jsf9k added this to Next Kraken and Skeleton Maintenance Nov 19, 2025

github-project-automation bot moved this to In progress in Skeleton Maintenance Nov 19, 2025

jsf9k moved this to In Progress in Next Kraken Nov 19, 2025

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

61978f6

jsf9k force-pushed the lineage/skeleton branch from b58946e to 61978f6 Compare November 19, 2025 18:05

jsf9k approved these changes Nov 19, 2025

View reviewed changes

jsf9k moved this from In progress to Review in progress in Skeleton Maintenance Nov 19, 2025

jsf9k marked this pull request as ready for review November 19, 2025 18:10

jsf9k requested review from dav3r and mcdonnnj as code owners November 19, 2025 18:10

dav3r approved these changes Nov 19, 2025

View reviewed changes

github-project-automation bot moved this from Review in progress to Reviewer approved in Skeleton Maintenance Nov 19, 2025

dependabot bot and others added 10 commits November 24, 2025 18:37

Upgrade the ansible-line pre-commit hook

504da27

This is necessary for cisagov/skeleton-ansible-role#243 (Fedora 43 support). See here for more details about this release: https://github.com/ansible/ansible-lint/releases/tag/v25.11.1

Add --py310-plus argument to pyupgrade

951238c

Python 3.10 is currently the oldest non-EOL version of Python, so we want to apply all rules that apply to this version or later. See here for more details: https://www.gyford.com/phil/writing/2025/08/26/how-to-use-pyupgrade/

Remove comments that are no longer relevant

d2fb5c3

Pin ansible-core to 2.17.7 or later

538a953

ansible-core<2.17.7 suffers from GHSA-99w6-3xph-cx78.

Merge pull request #242 from cisagov/improvement/add-argument-for-pyu…

7b01d4b

…pgrade Add `--py310-plus` argument to `pyupgrade` `pre-commit` hook

Merge pull request #241 from cisagov/improvement/upgrade-ansible-lint…

eadac91

…-pre-commit-hook Upgrade the `ansible-lint` `pre-commit` hook

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

2f14595

…s/checkout-6 Bump actions/checkout from 5 to 6

Merge pull request #243 from cisagov/improvement/pin-ansible-core

aacda2e

Pin `ansible-core` to 2.17.7 or later

Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton

32c966e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

cisagovbot commented Nov 19, 2025 •

edited by jsf9k

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

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

Are you sure you want to change the base?

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

Uh oh!

Conversation

cisagovbot commented Nov 19, 2025 • 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!

5 participants

cisagovbot commented Nov 19, 2025 •

edited by jsf9k

Loading