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

cisagovbot · 2025-11-21T00:49:51Z

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/mongo-db-from-config.git mongo-db-from-config
cd mongo-db-from-config
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 README.md setup.py src/mongo_db_from_config/_version.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.
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

Finalize version.

✅ Post-merge checklist

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

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] <support@github.com>

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.

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v5...v6) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

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 <david.redmin@trio.dhs.gov>

This is because this file now contains configurations for test tools. Also remove test tool config files that no longer exist.

These may be of use to folks who are editing pyproject.toml for a descendant of this skeleton repository.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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 gets rid of the .bandit.yml file that was being used only against the test code.

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.

See here for more details: https://packaging.python.org/en/latest/specifications/pyproject-toml/#classifiers

See here for more details: https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-labels

The setuptools build backend: - Supports native extensions, in contrast with the hatchling build backend - Is the most commonly used build backend among projects on PyPI - Is an officially supported build backend from Python, in contrast with the hatchling build backend

This ensures that the data file(s) are incorporated into the wheels that are built.

This project has no scripts.

This project has no package data.

Although PEP 639 allows us to specify teh license via a simple SPDX string, the versions of setuptools we have to use for Python 3.7 and 3.8 do not allow this; hence, this antiquated format from the deprecated PEP 621.

coveralls · 2025-11-24T18:22:59Z

coverage: 100.0%. remained the same
when pulling 772bb63 on lineage/skeleton
into d26a5d0 on develop.

From the dev and install dependencies list, respectively.

setuptools is a hidden dependency of mongomock, and it is not otherwise present under Python 3.12 and 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 pyproject.toml and remove setup.py

336618a

Move pytest config to pyproject.toml

c02b9d2

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 <david.redmin@trio.dhs.gov>

Add pyproject.toml as a trigger for the test label

8a10d11

This is because this file now contains configurations for test tools. Also remove test tool config files that no longer exist.

Add a few helpful comments

60d3f11

These may be of use to folks who are editing pyproject.toml for a descendant of this skeleton repository.

Add a few more classifiers

3b8d5fc

Correct license SPDX expression

8cb395a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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.

Move contents of .bandit.yml to CLI option in .pre-commit-config.yaml

da7213e

This gets rid of the .bandit.yml file that was being used only against the test code.

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.

Remove deprecated license classifier

7b9de90

See here for more details: https://packaging.python.org/en/latest/specifications/pyproject-toml/#classifiers

Use well-known labels for project URL keys

13abf00

See here for more details: https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-labels

Add package-data

da6d6a2

This ensures that the data file(s) are incorporated into the wheels that are built.

jsf9k unassigned dav3r and mcdonnnj Nov 24, 2025

jsf9k added this to BOD 18-01 and CyHy System Nov 24, 2025

github-project-automation bot moved this to In progress in BOD 18-01 Nov 24, 2025

jsf9k moved this to In Progress in CyHy System Nov 24, 2025

jsf9k added 3 commits November 24, 2025 12:48

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

10b50ba

Remove [project.scripts] table

4c34238

This project has no scripts.

Remove [project.package-data] table

b10d903

This project has no package data.

jsf9k force-pushed the lineage/skeleton branch 2 times, most recently from 206a111 to 5f6ee46 Compare November 24, 2025 17:57

Bump version from 1.2.0 to 1.2.1-rc.1

cfcd702

jsf9k force-pushed the lineage/skeleton branch from 5f6ee46 to cfcd702 Compare November 24, 2025 17:57

Specify the license via the deprecated PEP 621 format

9ce39fc

Although PEP 639 allows us to specify teh license via a simple SPDX string, the versions of setuptools we have to use for Python 3.7 and 3.8 do not allow this; hence, this antiquated format from the deprecated PEP 621.

jsf9k marked this pull request as ready for review November 24, 2025 18:31

jsf9k requested review from dav3r, jsf9k and mcdonnnj as code owners November 24, 2025 18:31

jsf9k moved this from In progress to Review in progress in BOD 18-01 Nov 24, 2025

jsf9k approved these changes Nov 24, 2025

View reviewed changes

jsf9k added 2 commits November 24, 2025 19:37

Remove types-setuptools and setuptools as dependencies

ec24337

From the dev and install dependencies list, respectively.

Add hidden dependency of mongomock for Python >= 3.12

772bb63

setuptools is a hidden dependency of mongomock, and it is not otherwise present under Python 3.12 and later.

jsf9k force-pushed the lineage/skeleton branch from ee3eb4d to 772bb63 Compare November 25, 2025 00:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

cisagovbot commented Nov 21, 2025 •

edited by jsf9k

Loading

Uh oh!

coveralls commented Nov 24, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

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

Are you sure you want to change the base?

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

Conversation

cisagovbot commented Nov 21, 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

✅ Pre-merge checklist

✅ Post-merge checklist

Uh oh!

coveralls commented Nov 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cisagovbot commented Nov 21, 2025 •

edited by jsf9k

Loading

coveralls commented Nov 24, 2025 •

edited

Loading