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

cisagovbot · 2025-01-31T23:34:36Z

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 [email protected]:cisagov/cyhy-kevsync.git cyhy-kevsync
cd cyhy-kevsync
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 .github/workflows/build.yml pytest.ini setup.py src/example/example.py tests/test_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 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.

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

This flag forces mypy to hide the errors about missing stubs and instead simply install stubs without asking for confirmation. It also does not return an error code, which it does without this flag even if you opt to let it install the missing type stubs.

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

* Use long flag names when possible * Enable debug logging * Add a helpful explanatory comment 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.

Use the latest v3 release available from NPM.

…max/ghaction-github-status-4 Bump crazy-max/ghaction-github-status from 3 to 4

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

Use an Action to install Packer in our GitHub Actions workflows

…hon-version-checks Add checks for correct semantic version of Python

@jasonodoom

Remove @jasonodoom as a codeowner

The pip-audit tool will audit any supplied pip requirements files for vulnerable packages.

src/example/example.py

We are using crazy-max/ghaction-github-status@v4 in our other workflows, so we should use it here too.

…-action Upgrade GH Action in CodeQL workflow

Also ensure that the dev dependencies listed in the setup.py file agree with those listed as additional dependencies for the mypy pre-commit hook.

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

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.

Improve pytest configuration

2d2feab

* Use long flag names when possible * Enable debug logging * Add a helpful explanatory comment 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.

Manually update the prettier hook

553efcb

Use the latest v3 release available from NPM.

Merge pull request #170 from cisagov/dependabot/github_actions/crazy-…

184e749

…max/ghaction-github-status-4 Bump crazy-max/ghaction-github-status from 3 to 4

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

d99c117

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

Merge pull request #187 from cisagov/improvement/use_setup_packer_action

2491ca0

Use an Action to install Packer in our GitHub Actions workflows

Merge pull request #176 from cisagov/improvement/correct-semantic-pyt…

f6c9537

…hon-version-checks Add checks for correct semantic version of Python

Merge pull request #188 from cisagov/remove-odoom-as-a-codeowner

10e5f6f

Remove @jasonodoom as a codeowner

Add a pre-commit hook to run pip-audit

045a998

The pip-audit tool will audit any supplied pip requirements files for vulnerable packages.

cisagovbot assigned jsf9k and mcdonnnj Jan 31, 2025

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

github-advanced-security bot found potential problems Feb 1, 2025

View reviewed changes

src/example/example.py Fixed Show fixed Hide fixed

jsf9k and others added 2 commits February 7, 2025 10:52

Upgrade GH Action in CodeQL workflow

72532d1

We are using crazy-max/ghaction-github-status@v4 in our other workflows, so we should use it here too.

Merge pull request #146 from cisagov/improvement/update-version-of-gh…

dfb0f1f

…-action Upgrade GH Action in CodeQL workflow

jsf9k unassigned felddy, dav3r and mcdonnnj Feb 10, 2025

jsf9k added 2 commits February 10, 2025 14:23

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

344d359

Update dev dependencies

fafe68c

Also ensure that the dev dependencies listed in the setup.py file agree with those listed as additional dependencies for the mypy pre-commit hook.

jsf9k force-pushed the lineage/skeleton branch from f7a3761 to fafe68c Compare February 10, 2025 19:25

jsf9k marked this pull request as ready for review February 10, 2025 20:06

jsf9k requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners February 10, 2025 20:06

jsf9k requested a review from a team February 10, 2025 20:06

jsf9k enabled auto-merge February 10, 2025 20:07

dv4harr10 approved these changes Feb 10, 2025

View reviewed changes

dav3r approved these changes Feb 12, 2025

View reviewed changes

jsf9k disabled auto-merge February 12, 2025 17:02

jsf9k added this pull request to the merge queue Feb 12, 2025

github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 12, 2025

jsf9k added this pull request to the merge queue Feb 12, 2025

github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 12, 2025

jsf9k added this pull request to the merge queue Feb 12, 2025

Merged via the queue into develop with commit 1a2e16f Feb 12, 2025
23 checks passed

jsf9k deleted the lineage/skeleton branch February 12, 2025 19:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jan 31, 2025 •

edited by jsf9k

Loading

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

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

Conversation

cisagovbot commented Jan 31, 2025 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

cisagovbot commented Jan 31, 2025 •

edited by jsf9k

Loading