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

cisagovbot · 2025-10-10T04:29:55Z

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-aws-lambda-python.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/publish-egress-ip-lambda.git publish-egress-ip-lambda
cd publish-egress-ip-lambda
git remote add skeleton https://github.com/cisagov/skeleton-aws-lambda-python.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 .github/dependabot.yml .github/labels.yml .github/lineage.yml .github/workflows/build.yml .github/workflows/codeql-analysis.yml .github/workflows/dependency-review.yml .github/workflows/sync-labels.yml .pre-commit-config.yaml Dockerfile README.md build/Pipfile build/Pipfile.lock docker-compose.yml src/version.txt 
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

Remove any of the following that do not apply. If you're unsure about any of these, don't hesitate to ask. We're here to help!

✌️ 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.
All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
Tests have been added and/or modified to cover the changes in this PR.
All new and existing tests pass.
Bump major, minor, patch, pre-release, and/or build versions as appropriate via the bump_version script if this repository is versioned and the changes in this PR warrant a version bump.
Create a pre-release (necessary if and only if the pre-release version was bumped).

✅ Pre-merge checklist

Remove any of the following that do not apply. These boxes should remain unchecked until the pull request has been approved.

Finalize version.

✅ Post-merge checklist

Remove any of the following that do not apply.

Create a release (necessary if and only if the version was bumped).

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

This commit will make a few changes. The orginal version of the semantic checking function was a bit more difficult to read. It is now somewhat easier to follow how the regex is structured. Also the function has been renamed to check_python_version since it has 2 functions, making sure that the version is semantically correct and the second is to make sure that it is installed on the user's machine. This makes it easier to follow the logic for the flags, -p or --python-version and -l or --list-versions

…ttps://github.com/cisagov/skeleton-generic into improvement/correct-semantic-python-version-checks

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

Add the `check-useless-excludes` meta hook to verify that any defined `exclude` directives apply to at least one file in the repository.

New versions of ansible-core (2.16.7 and 2.17.0) have been released that do not suffer from the bug discussed in ansible/ansible#82702. This bug broke any symlinked files in vars, tasks, etc. for any Ansible role installed via ansible-galaxy. All versions later than ansible-core 2.16.7 and 2.17.0 should function as expected. Co-authored-by: Nick <[email protected]>

The line is not only unnecessary, it was commented out to boot!

…lint On its own ansible-lint does not pull in ansible, only ansible-core. Therefore, if an Ansible module lives in ansible instead of ansible-core, the linter will complain that the module is unknown. In these cases it is necessary to add the ansible package itself as an additional dependency, with the same pinning as is done in requirements-test.txt of cisagov/skeleton-ansible-role.

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier was manually held back because the latest tags are for alpha releases of the next major version.

Use the latest v3 release available from NPM.

The pin now agrees with what is in cisagov/skeleton-ansible-role. Co-authored-by: Nick <[email protected]>

Update `pre-commit` hooks

…ible-lint Pin packages for `ansible-lint`

Instead of manually installing Packer we can instead leverage the hashicorp/setup-packer Action just as we do for Terraform.

He is no longer a member of @cisagov/vm-dev.

Previously we only provided a lower bound for the version, but pinning to a specific version aligns with what has been done with the prettier hook and how pre-commit hooks are pinned in general. The flake8-docstrings package is rarely updated, so there is no real downside to pinning to a specific version. Co-authored-by: Nick <[email protected]>

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

Bumps [crazy-max/ghaction-github-status](https://github.com/crazy-max/ghaction-github-status) from 3 to 4. - [Release notes](https://github.com/crazy-max/ghaction-github-status/releases) - [Commits](crazy-max/ghaction-github-status@v3...v4) --- updated-dependencies: - dependency-name: crazy-max/ghaction-github-status dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

More logging is always appreciated when troubleshooting failed tests. Co-authored-by: felddy <[email protected]>

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier hook was manually held back because the latest tags are for alpha releases of the next major version.

Co-authored-by: David Harris <[email protected]>

Enable pytest debug logging

…pose-warning Get rid of Docker warnings

Fix broken link in `README.md`

Instead of building for multiple Lambda runtimes it makes sense to just build targeting a single runtime. When deployed the infrastructure will just need to use the same runtime as supported by the Lambda configuration. Thus we drop support for all but the latest runtime that is specified in the configuration.

Store it in the build/ subdirectory along with the `pipenv` files.

Now that we only build for a single runtime version we can simplify the `build` job's functionality.

The need for this environment variable was removed in #3 but removing the creation of it was missed.

Now that there is only a single dependency configuration we need to update the README's directions for updating Python dependencies.

Add a comment to `build/Pipfile` and another to the Dockerfile that each mention keeping the Python versions specified in sync.

Update the Python dependencies installed for the Lambda by running `pipenv lock` in the `build/` directory.

…on_version Target a single Python runtime

Since the Pipfile and Pipfile.lock files define Python dependencies for the Lambda, any changed to either of these files should result in the `dependencies` label being applied.

Since we only build for one Pipfile configuration now the dependabot configuration should reflect that state of affairs.

…age/skeleton # Conflicts: # .github/dependabot.yml # .github/labels.yml # .github/lineage.yml # .github/workflows/build.yml # .github/workflows/codeql-analysis.yml # .github/workflows/dependency-review.yml # .github/workflows/sync-labels.yml # .pre-commit-config.yaml # Dockerfile # README.md # build/Pipfile # build/Pipfile.lock # docker-compose.yml # src/version.txt

…uto_labeling Apply the `dependencies` label for Pipfile changes

Fix the dependabot configuration

…age/skeleton # Conflicts: # .github/dependabot.yml

Michael Saki and others added 30 commits February 14, 2024 12:59

Add checks for semantic python versions

33582a1

Add checks for semantic python versions

cea8edc

Merge branch 'improvement/correct-semantic-python-version-checks' of h…

f7b9d05

…ttps://github.com/cisagov/skeleton-generic into improvement/correct-semantic-python-version-checks

Remove example of correct semantic version

327ab73

Refactor the error message for the user

4dedf50

Improve the semantic error message

e84deea

Fix grammar

5fdc7be

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

Refactor regex, add link, and improve comments

42ef8c2

Update link to use semver.org over regex101.com

a77e5e1

Remove unnecessary period

5fe14c7

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

Add a meta hook to the pre-commit configuration

b7896a0

Add the `check-useless-excludes` meta hook to verify that any defined `exclude` directives apply to at least one file in the repository.

Remove exclude directive that does not apply to any files

260566f

Remove unnecessary line

c74e5db

The line is not only unnecessary, it was commented out to boot!

Update pre-commit hook versions

f51fe62

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier was manually held back because the latest tags are for alpha releases of the next major version.

Manually update the prettier hook

8e55b8e

Use the latest v3 release available from NPM.

Correct commented-out ansible pin

c617bb9

The pin now agrees with what is in cisagov/skeleton-ansible-role. Co-authored-by: Nick <[email protected]>

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

de92c3c

Update `pre-commit` hooks

Merge pull request #182 from cisagov/improvement/pin-packages-for-ans…

7ddea47

…ible-lint Pin packages for `ansible-lint`

Add a lower-bound pin for flake8-docstrings

a68994d

Use the hashicorp/setup-packer GitHub Action

43b91c7

Instead of manually installing Packer we can instead leverage the hashicorp/setup-packer Action just as we do for Terraform.

Remove @jasonodoom as a codeowner

8ada75d

He is no longer a member of @cisagov/vm-dev.

Enable pytest debug logging

efa5ea7

More logging is always appreciated when troubleshooting failed tests. Co-authored-by: felddy <[email protected]>

Update pre-commit hook versions

6a58c2c

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier hook was manually held back because the latest tags are for alpha releases of the next major version.

jsf9k and others added 16 commits October 9, 2025 16:24

Fix broken link

551df1c

Co-authored-by: David Harris <[email protected]>

Merge pull request #33 from cisagov/improvement/pytest-debug-logging

c2390b3

Enable pytest debug logging

Merge pull request #31 from cisagov/improvement/get-rid-of-docker-com…

2b1e28f

…pose-warning Get rid of Docker warnings

Merge pull request #32 from cisagov/documentation/fix-broken-link

4a283c0

Fix broken link in `README.md`

Relocate the build_artifact.sh script

2d81553

Store it in the build/ subdirectory along with the `pipenv` files.

Update the GitHub Actions configuration

c85bd79

Now that we only build for a single runtime version we can simplify the `build` job's functionality.

Remove unused ENV instruction

723a78e

The need for this environment variable was removed in #3 but removing the creation of it was missed.

Update the README

36f232c

Now that there is only a single dependency configuration we need to update the README's directions for updating Python dependencies.

Add comments to keep Python versions synchronized

75a164a

Add a comment to `build/Pipfile` and another to the Dockerfile that each mention keeping the Python versions specified in sync.

Update the Lambda's Python dependencies

2c0ce9f

Update the Python dependencies installed for the Lambda by running `pipenv lock` in the `build/` directory.

Bump version from 0.0.2 to 0.0.3

522e0ea

Merge pull request #35 from cisagov/improvement/build_for_single_pyth…

6e3abc7

…on_version Target a single Python runtime

Apply the dependencies label for Pipfile changes

44f5c1a

Since the Pipfile and Pipfile.lock files define Python dependencies for the Lambda, any changed to either of these files should result in the `dependencies` label being applied.

Fix the dependabot configuration

5486230

Since we only build for one Pipfile configuration now the dependabot configuration should reflect that state of affairs.

cisagovbot assigned dav3r, jsf9k and mcdonnnj Oct 10, 2025

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

mcdonnnj and others added 3 commits October 15, 2025 15:51

Merge pull request #36 from cisagov/improvement/adjust_dependencies_a…

3962fea

…uto_labeling Apply the `dependencies` label for Pipfile changes

Merge pull request #37 from cisagov/bug/fix_dependabot_configuration

ac5a0a2

Fix the dependabot configuration

Merge https://github.com/cisagov/skeleton-aws-lambda-python into line…

1173346

…age/skeleton # Conflicts: # .github/dependabot.yml

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

cisagovbot commented Oct 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

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

Are you sure you want to change the base?

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

Uh oh!

Conversation

cisagovbot commented Oct 10, 2025

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

✅ Pre-merge checklist

✅ Post-merge checklist

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants