Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

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

Draft
wants to merge 55 commits into
base: develop
Choose a base branch
from
Draft

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

wants to merge 55 commits into from

Conversation

cisagovbot
Copy link

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

  1. Take ownership of this pull request by removing any other assignees.

  2. Clone the repository locally, and reapply the merge:

    git clone git@github.com:cisagov/log4j-md-yml.git log4j-md-yml
cd log4j-md-yml
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

  3. Review the changes displayed by the status command. Fix any conflicts and
    possibly incorrect auto-merges.

  4. After resolving each of the conflicts, add your changes to the
    branch, commit, and push your changes:

    git add .github/workflows/build.yml .pre-commit-config.yaml README.md setup.py src/_log4j_md_yml_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.

  5. Wait for all the automated tests to pass.

  6. Check the "Everything is cool" checkbox below:

    • ✌️ The conflicts in this pull request have been resolved.

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

mcdonnnj and others added 30 commits May 27, 2022 18:04
@mcdonnnj
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.
@mcdonnnj
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.
@mcdonnnj
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.
@mcdonnnj
Merge pull request #113 from cisagov/improvement/update_go_configuration
ec83308 
Update Go installation in the `build.yml` workflow
@dependabot
Bump hashicorp/setup-terraform from 1 to 2
2775dfa 
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>
@mcdonnnj
Merge pull request #111 from cisagov/dependabot/github_actions/hashic…
4925eb1 
…orp/setup-terraform-2

Bump hashicorp/setup-terraform from 1 to 2
@dependabot
Bump actions/setup-python from 3 to 4
1f7c62e 
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>
@mcdonnnj
Merge pull request #115 from cisagov/dependabot/github_actions/action…
f74b4a3 
…s/setup-python-4

Bump actions/setup-python from 3 to 4
@mcdonnnj
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.
@mcdonnnj
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.
@mcdonnnj
Merge pull request #112 from cisagov/improvement/update_dependabot_ig…
a8bcddd 
…nores

Update Dependabot ignore directives
@mcdonnnj
Remove usage of set-output from our GitHub Actions workflow
71a88a5 
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.
@mcdonnnj
Merge pull request #119 from cisagov/bug/update_github_actions_workflow
0867685 
Remove usage of `set-output` from our GitHub Actions workflow
@mcdonnnj
Enable the allow-non-breakable-inline-mappings rule for yamllint
21a68f4
@mcdonnnj
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.
@mcdonnnj
Merge pull request #117 from cisagov/improvement/update_yamllint_line…
cfa9ba5 
…-length_rules

Update the `line-length` configuration for `yamllint`
@mcdonnnj
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.
@mcdonnnj
Merge pull request #120 from cisagov/bug/verify_pre-commit_hook_repos
2a98c6a 
Update the `flake8` pre-commit hook configuration
@mcdonnnj
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.
@mcdonnnj
Merge pull request #114 from cisagov/maintenance/update_pre-commit_hooks
bb9c2a0 
Update pre-commit hooks
@mcdonnnj
Add a label configuration file
e5fbd70 
This configuration file stores information about the labels expected in
this repository.
@mcdonnnj
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.
@jsf9k @mcdonnnj
Remove duplicate label
161c4ae
@jsf9k @mcdonnnj
Add a label for issues or PRs that involve test code
5993231
@mcdonnnj
Merge pull request #118 from cisagov/improvement/add_label_sync_workflow
c4fbf20 
Add workflow to manage repository labels
@mcdonnnj
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.
@mcdonnnj
Correct spacing in yamllint rules
8f12635 
There was a missing empty line in the `.yamllint` file between two rule
definitions.
@mcdonnnj
Merge pull request #122 from cisagov/bug/fix_bad_configurations
e803e1a 
Update two configuration files
@mcdonnnj
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.
@mcdonnnj
Merge pull request #114 from cisagov/bug/pin_ubuntu_image_for_py3.6
a118836 
Pin Python 3.6 testing to Ubuntu 20.04
mcdonnnj and others added 21 commits January 7, 2023 14:52
@mcdonnnj
Merge github.com:cisagov/skeleton-generic into lineage/skeleton
19f3f8f
@mcdonnnj
Add a python label
b389d8a 
Since this project is for a Python package it makes sense to include a
`python` label.
@mcdonnnj
Merge pull request #110 from cisagov/lineage/skeleton
461e873 
⚠️ CONFLICT! Lineage pull request for: skeleton
@mcdonnnj
Update the version of the second bandit hook
62c8394 
The `bandit (everything else)` hook was not updated in sync with the
`bandit (tests tree)` hook and is using an older version of bandit.
@mcdonnnj @dav3r
Correct poor English in comments for the bandit pre-commit hooks
99ee709 
Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
@mcdonnnj
Merge pull request #111 from cisagov/bug/update_bandit_in_pre-commit_…
36b39b8 
…configuration

Update the version of the second `bandit` hook
@mcdonnnj
Add a CodeQL status badge to the README
f3f9d92
@mcdonnnj
Remove LGTM badges from the README
fa30ebb 
Now that LGTM has been deprecated in favor of GitHub code scanning
(CodeQL) we have removed the integration from the organization. As a
result we need to remove these badges.
@mcdonnnj
Merge pull request #115 from cisagov/improvement/update_codeql_workflow
ec639ea 
Add a CodeQL badge and remove LGTM badges from the README
@mcdonnnj
Add additional PyPI trove classifiers
abb9311 
Since we only support Python 3 and only test against CPython (the
reference implementation) it would be helpful to indicate these facts
with our trove classifiers.
@mcdonnnj
Merge pull request #108 from cisagov/improvement/update_trove_classif…
94f78f9 
…iers

Add two additional PyPI trove classifiers
@jsf9k @mcdonnnj
Fix overly match-happy sed commands
56c90d6 
We saw in cisagov/postfix-docker#47 that the sed commands in the
bump_version.sh script could inadvertently match the CC0 version in
the README.md file.  This change escapes the periods in the version
before passing it on to sed so that they only match periods and not
just any character.
@mcdonnnj
Merge pull request #104 from cisagov/bugfix/tighten-regex-in-version-…
5314334 
…script

Fix overly match-happy sed commands
@mcdonnnj
Add a GitHub Actions job to test wheels
034cef8 
This job will test thw wheels created during the `build` job to ensure
the distribution artifact also passes tests.
@mcdonnnj
Prefer block-style to flow-style in GitHub Actions job needs
63f4a73
@mcdonnnj
Merge pull request #116 from cisagov/improvement/test_wheels_built_in…
cbc0157 
…_github_actions

Add a GitHub Actions job to test built wheels
@mcdonnnj
Add support for Python 3.11
6a5c156 
With the release of Python 3.11 on 2022-10-24 we should add it to our
supported Python versions. This includes an appropriate PyPI trove
classifier and adding it to the Python versions that are tested in our
GitHub Actions workflow.
@mcdonnnj
Bump version from 0.1.0 to 0.2.0
abd6218
@mcdonnnj
Merge pull request #109 from cisagov/improvement/add_support_for_pyth…
65604c7 
…on_3.11

Add support for Python 3.11
@dependabot
Bump actions/upload-artifact from 2 to 3
c7c0ee9 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Merge https://github.com/cisagov/skeleton-python-library into lineage…
d28cf0d 
…/skeleton

# Conflicts:
#	.github/workflows/build.yml
#	.pre-commit-config.yaml
#	README.md
#	setup.py
#	src/_log4j_md_yml_version.py
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Jan 7, 2023
mcdonnnj and others added 4 commits January 8, 2023 13:56
@mcdonnnj
Merge pull request #102 from cisagov/dependabot/github_actions/action…
f514a6c 
…s/upload-artifact-3

Bump actions/upload-artifact from 2 to 3
@mcdonnnj
Add ignore directives to the dependabot configuration
4709716 
Add ignore directives and an attribution comment to the dependabot
configurtation. These will be uncommented in descendants of this
project (cisagov/skeleton-python-library) so that version changes to
these Actions are controlled through this project.
@mcdonnnj
Merge pull request #117 from cisagov/improvement/add_github_actions_a…
eb2605b 
…ttributions

Add ignore directives to the dependabot configuration
Merge https://github.com/cisagov/skeleton-python-library into lineage…
7ae63dd 
…/skeleton
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dav3r dav3r Awaiting requested review from dav3r dav3r will be requested when the pull request is marked ready for review dav3r is a code owner

@felddy felddy Awaiting requested review from felddy felddy will be requested when the pull request is marked ready for review felddy is a code owner

@jsf9k jsf9k Awaiting requested review from jsf9k jsf9k will be requested when the pull request is marked ready for review jsf9k is a code owner

@mcdonnnj mcdonnnj Awaiting requested review from mcdonnnj mcdonnnj will be requested when the pull request is marked ready for review mcdonnnj is a code owner

At least 2 approving reviews are required to merge this pull request.

Assignees

@felddy felddy

@jsf9k jsf9k

@dav3r dav3r

@mcdonnnj mcdonnnj

Labels
upstream update This issue or pull request pulls in upstream updates
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cisagovbot @felddy @jsf9k @dav3r @mcdonnnj