This repository has been archived by the owner on Jan 24, 2024. It is now read-only.
Manually Merge skeleton-python-library to Resolve Unrelated Histories Error #18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…:cisagov/skeleton-generic into improvement-pytest
…es_from_skeleton_generic Pull in upstream changes from skeleton-generic
One for tests and one for everthing else.
Improvement pytest
This should speed up TravisCI builds.
Via pre-commit autoupdate.
Use TravisCI caching to speed up builds
…ent/upstream_updates
Upstream updates
This shows how to added data to a package and correctly access it.
Add changes from running pre-commit autoupdate
terraform-docs is currently broken with respect to terraform 0.12.
Remove the terraform-docs hook
…ent/merge_in_upstream_changes
…nges Merge in upstream changes from cisagov/skeleton-generic
Improvement/data
JSON files are already being linted by the pretty-format-json hook.
…re_json_files Configure prettier to ignore JSON files
…ent/pull_in_upstream_changes
Pull in upstream changes
Add Snyk badge/shield
Make the job name the first part of the cache key since it is the only part that isn't variable.
…nd_cache_actions_to_v2 Update actions/cache and actions/setup-python to v2
All jobs should perform identical work in a consistent manner.
Lineage pull request for: skeleton
Autoupdate pre-commit and Additional Maintenance
Add "requirements.txt" to the actions/cache key for the test job to match what was done for the lint job. Expand the option to pip in requirements.txt to its full, more descriptive form. This matches efforts to do this elsewhere in our codebases.
⚠️ CONFLICT! Lineage pull request for: skeleton
Update action/upload-artifact Version
mcdonnnj
requested review from
dav3r,
felddy,
jsf9k and
a team
as code owners
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🗣 Description
This PR is a manual merge of this repository with cisagov/skeleton-python-library, since they appear to have deviated enough that merges no longer automatically succeed (unrelated histories error).
💭 Motivation and Context
I was checking a recent cisagov/action-lineage run and saw that this repo (among others) was unable to merge. Hopefully manually merging them will allow future automated PRs to generate.
🧪 Testing
Just automated tests.
📷 Screenshots (if appropriate)
🚥 Types of Changes
✅ Checklist