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

cisagovbot · 2023-01-07T21:22:45Z

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/assessment-data-export.git assessment-data-export
cd assessment-data-export
git remote add skeleton https://github.com/cisagov/skeleton-python-library.git
git remote set-url --push skeleton no_push
git switch develop
git checkout -b 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 src/ade/_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.
Check the "Everything is cool" checkbox below:
- ✌️ The conflicts in this pull request have been resolved.
Mark this draft pull request "Ready for review".

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

Additionally as of v3.1.0 of actions/setup-go there is a go-version output value to retrieve the version of Go installed by the Action. This allows us to remove the step to manually retrieve this information from the Go executable.

Go 1.16 is no longer supported as of the release of 1.18 so it makes sense to update to the latest version available.

Go 1.19 was released while this branch was in the wings and it makes sense to bump to the latest Go release.

Update Go installation in the `build.yml` workflow

Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 1 to 2. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](hashicorp/setup-terraform@v1...v2) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

…orp/setup-terraform-2 Bump hashicorp/setup-terraform from 1 to 2

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

…s/setup-python-4 Bump actions/setup-python from 3 to 4

Add a comment that states that the commented out ignore directives are managed by cisagov/skeleton-generic.

This adds the other versioned Actions that should be managed by cisagov/skeleton-generic to the list of commented out dependencies to ignore.

…nores Update Dependabot ignore directives

GitHub has deprecated the set-output command per: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ This updates the GitHub Actions workflow to use the newly preferred method to set the output for a job's step.

Remove usage of `set-output` from our GitHub Actions workflow

Increase the line length maximum from the default of 80 to 88. This 10% increase mirrors the line length allowed in other linter configurations such as black.

…-length_rules Update the `line-length` configuration for `yamllint`

Per PyCQA/flake8#1290 this hook moved from GitLab to GitHub. The version we use is bumped to the latest tag on GitHub as well.

Update the `flake8` pre-commit hook configuration

Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook is intentionally held back due to issues with upgrading to v6.

Update pre-commit hooks

This configuration file stores information about the labels expected in this repository.

This adds a workflow to ensure that the repository labels are updated to reflect changes to the label configuration file .github/labels.yml.

Add workflow to manage repository labels

Update the configuration for repository labels to remove the leading `#` from color values. With a `#` leading the values they are seen as invalid by the GitHub API.

There was a missing empty line in the `.yamllint` file between two rule definitions.

Update two configuration files

There is no Python 3.6 on Ubuntu 22.04 release available from actions/python-versions. Since Ubuntu 22.04 is what is being used for the `ubuntu-latest` tag we need to pin Python 3.6 testing to use the old `ubuntu-20.04` tag.

Pin Python 3.6 testing to Ubuntu 20.04

Add a security label

Lineage pull request for: skeleton

Retrieve the wheel to a `dist/` sub-directory and get the name of the specific file (wheel) to be installed. Then update the installation step to use this found filename instead of a wildcard.

When installing the wheel that was built in the `build` job we will also install the `test` optional dependencies.

…ncies_in_test-build_gha_job Improve testing dependency installation in the `test-build` job

Sort all pre-`steps` keys alphabetically descending. Sorting all keys alphabetically would be somewhat onerous because the `strategy` key would come after the `steps` key even though it's configuration information. We can at least sort everything but the `steps` key in alphabetically descending order and make the `steps` the last for a job.

Add `name` keys to the `test`, `build`, and `test-build` jobs that are both more descriptive and include the Python version from the job's matrix. This will produce consistent and more helpful job names in the GitHub Actions log in the GitHub web UI.

…s_using_matrix_strategy Improve job names for the `build` workflow in GitHub Actions

…/skeleton

jsf9k

Please correct the small oversight I commented on.

Also, here is a friendly reminder to create a release after merging: 🐧

.github/dependabot.yml

Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>

setup.py

src/ade/assessment_data_export.py

This is a more appropriate place for them, since they are not necessary for testing. Co-authored-by: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>

mcdonnnj

LGTM ✔Just one pair of suggestions for your consideration.

requirements-dev.txt

.pre-commit-config.yaml

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

mcdonnnj and others added 30 commits May 27, 2022 18:04

Update actions/setup-go from v2 to v3

57b4abe

Additionally as of v3.1.0 of actions/setup-go there is a go-version output value to retrieve the version of Go installed by the Action. This allows us to remove the step to manually retrieve this information from the Go executable.

Update the version of Go used from 1.16 to 1.18

8f68498

Go 1.16 is no longer supported as of the release of 1.18 so it makes sense to update to the latest version available.

Update the version of Go used from 1.18 to 1.19

fc55e84

Go 1.19 was released while this branch was in the wings and it makes sense to bump to the latest Go release.

Merge pull request #113 from cisagov/improvement/update_go_configuration

ec83308

Update Go installation in the `build.yml` workflow

Merge pull request #111 from cisagov/dependabot/github_actions/hashic…

4925eb1

…orp/setup-terraform-2 Bump hashicorp/setup-terraform from 1 to 2

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

f74b4a3

…s/setup-python-4 Bump actions/setup-python from 3 to 4

Add an ownership comment to the Dependabot configuration

6a9c630

Add a comment that states that the commented out ignore directives are managed by cisagov/skeleton-generic.

Add additional Dependabot ignore directives

dfd54e9

This adds the other versioned Actions that should be managed by cisagov/skeleton-generic to the list of commented out dependencies to ignore.

Merge pull request #112 from cisagov/improvement/update_dependabot_ig…

a8bcddd

…nores Update Dependabot ignore directives

Merge pull request #119 from cisagov/bug/update_github_actions_workflow

0867685

Remove usage of `set-output` from our GitHub Actions workflow

Enable the allow-non-breakable-inline-mappings rule for yamllint

21a68f4

Increase the maximum line length in the yamllint configuration

3547c4f

Increase the line length maximum from the default of 80 to 88. This 10% increase mirrors the line length allowed in other linter configurations such as black.

Merge pull request #117 from cisagov/improvement/update_yamllint_line…

cfa9ba5

…-length_rules Update the `line-length` configuration for `yamllint`

Fix the repo of the flake8 pre-commit hook

b1ea3d4

Per PyCQA/flake8#1290 this hook moved from GitLab to GitHub. The version we use is bumped to the latest tag on GitHub as well.

Merge pull request #120 from cisagov/bug/verify_pre-commit_hook_repos

2a98c6a

Update the `flake8` pre-commit hook configuration

Update pre-commit hooks

fb8d13f

Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook is intentionally held back due to issues with upgrading to v6.

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

bb9c2a0

Update pre-commit hooks

Add a label configuration file

e5fbd70

This configuration file stores information about the labels expected in this repository.

Add a workflow to synchronize repository labels

b9792a8

This adds a workflow to ensure that the repository labels are updated to reflect changes to the label configuration file .github/labels.yml.

Remove duplicate label

161c4ae

Add a label for issues or PRs that involve test code

5993231

Merge pull request #118 from cisagov/improvement/add_label_sync_workflow

c4fbf20

Add workflow to manage repository labels

Fix GitHub label color values

6cc53dc

Update the configuration for repository labels to remove the leading `#` from color values. With a `#` leading the values they are seen as invalid by the GitHub API.

Correct spacing in yamllint rules

8f12635

There was a missing empty line in the `.yamllint` file between two rule definitions.

Merge pull request #122 from cisagov/bug/fix_bad_configurations

e803e1a

Update two configuration files

Pin Python 3.6 testing to Ubuntu 20.04

d9a1c30

There is no Python 3.6 on Ubuntu 22.04 release available from actions/python-versions. Since Ubuntu 22.04 is what is being used for the `ubuntu-latest` tag we need to pin Python 3.6 testing to use the old `ubuntu-20.04` tag.

Merge pull request #114 from cisagov/bug/pin_ubuntu_image_for_py3.6

a118836

Pin Python 3.6 testing to Ubuntu 20.04

jsf9k and others added 10 commits February 2, 2023 13:56

Add a security label

313e792

Merge pull request #125 from cisagov/improvement/add-security-label

b7c0a75

Add a security label

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

2c4b5be

Merge pull request #119 from cisagov/lineage/skeleton

8b589d1

Lineage pull request for: skeleton

Update wheel installation in the test-build job

0c52e46

Retrieve the wheel to a `dist/` sub-directory and get the name of the specific file (wheel) to be installed. Then update the installation step to use this found filename instead of a wildcard.

Install the test dependencies of the built wheel

22bce63

When installing the wheel that was built in the `build` job we will also install the `test` optional dependencies.

Merge pull request #118 from cisagov/improvement/install_test_depende…

9be0934

…ncies_in_test-build_gha_job Improve testing dependency installation in the `test-build` job

Merge pull request #120 from cisagov/improvement/update_names_for_job…

65efbf6

…s_using_matrix_strategy Improve job names for the `build` workflow in GitHub Actions

dav3r unassigned mcdonnnj Feb 8, 2023

dav3r added 3 commits February 8, 2023 16:44

Merge https://github.com/cisagov/skeleton-python-library into lineage…

9e75c8b

…/skeleton

Satisfy mypy

7d7ff49

Satisfy pyupgrade

e1016dc

dav3r force-pushed the lineage/skeleton branch from 619c1ec to e1016dc Compare February 8, 2023 22:04

dav3r marked this pull request as ready for review February 9, 2023 03:21

dav3r requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners February 9, 2023 03:21

jsf9k suggested changes Feb 9, 2023

View reviewed changes

.github/dependabot.yml Outdated Show resolved Hide resolved

Uncomment ignore directives managed by skeleton-python-library

8e9fb20

Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>

mcdonnnj suggested changes Feb 9, 2023

View reviewed changes

setup.py Outdated Show resolved Hide resolved

src/ade/assessment_data_export.py Show resolved Hide resolved

Move stubs packages to dev requirements

799661f

This is a more appropriate place for them, since they are not necessary for testing. Co-authored-by: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>

jsf9k approved these changes Feb 9, 2023

View reviewed changes

dav3r requested a review from mcdonnnj February 9, 2023 22:40

mcdonnnj approved these changes Feb 16, 2023

View reviewed changes

requirements-dev.txt Show resolved Hide resolved

.pre-commit-config.yaml Show resolved Hide resolved

Include types-setuptools as a dev/mypy dependency

ac18f65

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

dav3r merged commit 603586f into develop Feb 16, 2023

dav3r deleted the lineage/skeleton branch February 16, 2023 18:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jan 7, 2023 •

edited by dav3r

jsf9k left a comment

mcdonnnj left a comment

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

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

Conversation

cisagovbot commented Jan 7, 2023 • edited by dav3r

Lineage Pull Request: CONFLICT

How to resolve the conflicts

jsf9k left a comment

Choose a reason for hiding this comment

mcdonnnj left a comment

Choose a reason for hiding this comment

cisagovbot commented Jan 7, 2023 •

edited by dav3r