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

cisagovbot · 2024-09-25T08:31:25Z

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-aws-lambda-python.git skeleton-aws-lambda-python
cd skeleton-aws-lambda-python
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 .github/workflows/build.yml 
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

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]>

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.

Use the latest v3 release available from NPM.

…mmit_hook Add a pre-commit hook to run `pip-audit`

Add a lower-bound pin for the `flake8-docstrings` `pip` package

Update `pre-commit` hooks

This replaces the now archived pre-commit/mirrors-prettier hook.

Switch the `pre-commit` hook used to run `prettier`

…skeleton

We should use the same version of bandit throughout the pre-commit configuration.

dv4harr10 · 2024-10-01T14:48:11Z

Hi Team @ALL , I think docker-compose.yml line 2 should use double quotes instead of single quotes.

jsf9k · 2024-10-01T14:59:02Z

Hi Team @ALL , I think docker-compose.yml line 2 should use double quotes instead of single quotes.

That line is going away anyway. (The version key has been deprecated.) See #31.

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.

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.

Manually update the prettier hook

553efcb

Use the latest v3 release available from NPM.

mcdonnnj added 5 commits September 25, 2024 07:06

Merge pull request #179 from cisagov/improvement/add_pip-audit_pre-co…

5801cec

…mmit_hook Add a pre-commit hook to run `pip-audit`

Merge pull request #184 from cisagov/improvement/pin-flake8-docstrings

e61255c

Add a lower-bound pin for the `flake8-docstrings` `pip` package

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

44cd1be

Update `pre-commit` hooks

Use the rbubley/mirrors-prettier hook for prettier

c502f1a

This replaces the now archived pre-commit/mirrors-prettier hook.

Merge pull request #186 from cisagov/improvement/switch_prettier_hook

f0e55b3

Switch the `pre-commit` hook used to run `prettier`

cisagovbot assigned dav3r, felddy, jsf9k and mcdonnnj Sep 25, 2024

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Sep 25, 2024

jsf9k unassigned felddy, dav3r and mcdonnnj Sep 25, 2024

jsf9k added the github-actions Pull requests that update GitHub Actions code label Sep 25, 2024

jsf9k added 2 commits September 25, 2024 09:34

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

97f40fc

…skeleton

Upgrade an instance of actions/cache to v4

e452973

jsf9k force-pushed the lineage/skeleton branch from a923519 to 55f4037 Compare September 25, 2024 13:36

jsf9k marked this pull request as ready for review September 25, 2024 13:54

jsf9k requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners September 25, 2024 13:54

jsf9k requested a review from a team September 25, 2024 13:54

Upgrade bandit to 1.7.10

a06c2b9

We should use the same version of bandit throughout the pre-commit configuration.

jsf9k force-pushed the lineage/skeleton branch from 55f4037 to a06c2b9 Compare September 25, 2024 13:57

dv4harr10 approved these changes Sep 25, 2024

View reviewed changes

jsf9k assigned mcdonnnj Sep 25, 2024

dav3r approved these changes Sep 25, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Sep 25, 2024 •

edited by jsf9k

Loading

dv4harr10 commented Oct 1, 2024

jsf9k commented Oct 1, 2024

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

Are you sure you want to change the base?

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

Conversation

cisagovbot commented Sep 25, 2024 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

dv4harr10 commented Oct 1, 2024

jsf9k commented Oct 1, 2024

cisagovbot commented Sep 25, 2024 •

edited by jsf9k

Loading