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

cisagovbot · 2020-06-18T18:16:49Z

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-aws-lambda.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/findings-data-import-lambda.git findings-data-import-lambda
cd findings-data-import-lambda
git remote add skeleton https://github.com/cisagov/skeleton-aws-lambda.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 checkout --ours -- .github/lineage.yml
git add .github/lineage.yml
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 .coveragerc .github/CODEOWNERS .github/workflows/build.yml .gitignore .isort.cfg CONTRIBUTING.md Dockerfile README.md build.sh bump_version.sh docker-compose.yml eal/_version.py fdi/_version.py lambda_handler.py setup.py src/example/_version.py 
git commit --message="Resolve Lineage conflicts."
git push --force --set-upstream origin lineage/skeleton

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

…alled as a hook.

…0 due to an ImportError seen in the GitHub Action. When installed locally I correctly get a 4.4 < installed < 5.0, but on GitHub it is pulling down 5.0 which gives the coveralls package problems.

… code.

Pull in latest version of skeleton-python-library.

A user forked cisagov/scan-target-data and created a pull request, but the required GitHub Action(s) did not run. This is presumably because the user does not have Actions enabled in his or her fork. Ideally, the required Action(s) would run in cisagov/scan-target-data when a PR to merge changes back is created. Based on my reading of this link, adding the "pull_request" event type should make this happen: https://help.github.com/en/actions/automating-your-workflow-with-github-actions/events-that-trigger-workflows#pull-request-events-for-forked-repositories

…m-forked-repos Make workflow run when a PR is opened, synchronized, or reopened

…rrect workflow if someone forks and does a pull request.

…hange_from_upstream Pull in build Workflow Changes from Upstream

…into develop

Remove explicit setuptools upgrade. Add --system-site-packages flag to venv setup so only packages not in the environment already are installed.

Log output instead of print. Improve docs. Do some interesting parsing.

This was a bad example of when to use xfail. See the semantics here: http://doc.pytest.org/en/latest/skipping.html

Advertise support for 3.8 in setup.py

Add schema validation for docopt arguments.

…into develop

Cleanup Linux instructions and add WSL references to CONTRIBUTING.md

Update actions/checkout to v2 Update formatting to match downstream children

…n_and_checkout_action Update Python and actions/checkout Versions

Update pre-commit hooks (and flip Actions cache order in workflow).

…provements/pull_in_upstream_updates

…--verbose --all-files).

…ngle Source of Truth.

⚠️ CONFLICT! Lineage pull request for: skeleton

…/skeleton

Lineage pull request for: skeleton

lgtm-com · 2020-06-18T18:28:24Z

This pull request introduces 2 alerts when merging 5df1045 into 800e1d5 - view on LGTM.com

new alerts:

2 for Syntax error

jsf9k

The setup.py still lists support for 3.6, 3.7, and 3.8. I think that either setup.py should be constrained to support 3.8 only, or this repo should use the python version matrix jazz to test all three versions.

In short, setup.py and the build.yml workflow do not agree with each other.

mcdonnnj · 2020-06-19T14:48:16Z

The setup.py still lists support for 3.6, 3.7, and 3.8. I think that either setup.py should be constrained to support 3.8 only, or this repo should use the python version matrix jazz to test all three versions.

In short, setup.py and the build.yml workflow do not agree with each other.

This PR is unrelated to cisagov/skeleton-aws-lambda#10. I'm not sure why it took a PR generating in cisagov/skeleton-aws-lambda for this to generate, but this PR consisted of all the changes I'd already handled in #19.

jsf9k · 2020-06-19T15:42:58Z

This PR is unrelated to cisagov/skeleton-aws-lambda#10. I'm not sure why it took a PR generating in cisagov/skeleton-aws-lambda for this to generate, but this PR consisted of all the changes I'd already handled in #19.

I think I'm missing something. I don't see how the concerns in my comment have been addressed. TBH, I don't understand "this PR consisted of all the changes I'd already handled in #19." (This sounds harsher than intended, but I don't know how to reword it. I am confused.)

jsf9k · 2020-06-19T15:57:25Z

This PR is unrelated to cisagov/skeleton-aws-lambda#10. I'm not sure why it took a PR generating in cisagov/skeleton-aws-lambda for this to generate, but this PR consisted of all the changes I'd already handled in #19.

I think I'm missing something. I don't see how the concerns in my comment have been addressed. TBH, I don't understand "this PR consisted of all the changes I'd already handled in #19." (This sounds harsher than intended, but I don't know how to reword it. I am confused.)

@mcdonnnj explained to me that this repo will get a second PR via lineage once cisagov/skeleton-aws-lambda#10 is merged.

mcdonnnj · 2020-06-19T15:58:44Z

This PR is unrelated to cisagov/skeleton-aws-lambda#10. I'm not sure why it took a PR generating in cisagov/skeleton-aws-lambda for this to generate, but this PR consisted of all the changes I'd already handled in #19.

I think I'm missing something. I don't see how the concerns in my comment have been addressed. TBH, I don't understand "this PR consisted of all the changes I'd already handled in #19." (This sounds harsher than intended, but I don't know how to reword it. I am confused.)

EDIT: Added this reply to hopefully provide clarity to what I meant.

Sorry for not being clear enough. What I meant is that this auto-generated PR was repeating the work I did in #19 in an attempt to avoid this exact situation. It is unclear to me right now why lineage did not generate this PR before now, and why it appears the generated PR cisagov/skeleton-aws-lambda#10 triggered lineage to decide this repository wasn't up-to-date.

dav3r

👍 👍

mcdonnnj

Good work @mcdonnnj

Update Lambda Building and Related GHA Job

mcdonnnj and others added 30 commits December 16, 2019 09:51

Initial commit with changes from skeleton-python-library.

ad11340

Change GitHub Actions Python versions to 3.8

f6fff57

Fix code formatting that snuck through because pre-commit wasn't inst…

55bd2ca

…alled as a hook.

Set a requirement for the coverage package to be less than version 5.…

c406882

…0 due to an ImportError seen in the GitHub Action. When installed locally I correctly get a 4.4 < installed < 5.0, but on GitHub it is pulling down 5.0 which gives the coveralls package problems.

Fix coveralls configuration file to look at the correct directory for…

77799ab

… code.

Merge remote-tracking branch 'skeleton' into develop

15f259e

Pull in latest version of skeleton-python-library.

Improve list formatting

dbd589d

Merge pull request #29 from cisagov/improvement/better-handle-prs-fro…

a8e35d0

…m-forked-repos Make workflow run when a PR is opened, synchronized, or reopened

Pull in changes to build workflow from skeleton-generic to support co…

aaef908

…rrect workflow if someone forks and does a pull request.

Merge pull request #33 from cisagov/improvement/pull_build_workflow_c…

3356ecf

…hange_from_upstream Pull in build Workflow Changes from Upstream

Merge branch 'develop' of github.com:cisagov/skeleton-python-library …

c60a34a

…into develop

Adjust build.sh comments.

fb71a2f

Remove explicit setuptools upgrade. Add --system-site-packages flag to venv setup so only packages not in the environment already are installed.

Add schema library.

7db8787

Add schema checks for arguments.

229da93

Log output instead of print. Improve docs. Do some interesting parsing.

Add tests for new arguments

7cbaaa9

Removed uses of xfail.

8520a70

This was a bad example of when to use xfail. See the semantics here: http://doc.pytest.org/en/latest/skipping.html

Bumping github actions python version to 3.8.

454553e

Advertise support for 3.8 in setup.py

Merge pull request #34 from cisagov/improvement/schema

decd0f7

Add schema validation for docopt arguments.

Merge branch 'develop' of github.com:cisagov/skeleton-python-library …

4563ca3

…into develop

Backported changes to CONTRIBUTING.md from the development guide.

5327516

Merge pull request #31 from cisagov/improvements/add_wsl_instructions

3f6d654

Cleanup Linux instructions and add WSL references to CONTRIBUTING.md

Update Python version used to 3.8

f7a4166

Update actions/checkout to v2 Update formatting to match downstream children

Merge pull request #32 from cisagov/improvements/update_python_versio…

8116a89

…n_and_checkout_action Update Python and actions/checkout Versions

Run pre-commit autoupdate.

b857939

Flip cache order to mirror how it is done downstream.

d99fd00

Merge pull request #33 from cisagov/improvement/update_pre-commit_hooks

16872bf

Update pre-commit hooks (and flip Actions cache order in workflow).

Merge branch 'develop' of github.com:cisagov/skeleton-generic into im…

965c3d9

…provements/pull_in_upstream_updates

Fix spacing before comment in .bandit.yml (shown with pre-commit run …

fd03337

…--verbose --all-files).

Unpin coverage as coveralls supports coverage 5.0+ as of 1.10.0

49f7002

mcdonnnj and others added 4 commits June 15, 2020 17:35

Remove requirements that already exist in setup.py to align with a Si…

370f2a2

…ngle Source of Truth.

Merge pull request #44 from cisagov/lineage/skeleton

50b3841

⚠️ CONFLICT! Lineage pull request for: skeleton

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

0496f7f

…/skeleton

Merge pull request #9 from cisagov/lineage/skeleton

5f5a570

Lineage pull request for: skeleton

cisagovbot assigned mcdonnnj and mzack5020 Jun 18, 2020

mcdonnnj unassigned mzack5020 Jun 19, 2020

Resolve Lineage conflicts.

482bab0

mcdonnnj force-pushed the lineage/skeleton branch from 5df1045 to 482bab0 Compare June 19, 2020 05:45

mcdonnnj marked this pull request as ready for review June 19, 2020 05:51

mcdonnnj requested review from mcdonnnj and mzack5020 as code owners June 19, 2020 05:51

mcdonnnj requested review from a team, dav3r, felddy, hillaryj and jsf9k June 19, 2020 05:51

jsf9k suggested changes Jun 19, 2020

View reviewed changes

mcdonnnj requested a review from jsf9k June 19, 2020 15:02

jsf9k approved these changes Jun 19, 2020

View reviewed changes

dav3r approved these changes Jun 19, 2020

View reviewed changes

mcdonnnj approved these changes Jun 19, 2020

View reviewed changes

mcdonnnj merged commit e611990 into develop Jun 19, 2020

mcdonnnj deleted the lineage/skeleton branch June 19, 2020 17:14

cisagovbot pushed a commit that referenced this pull request Dec 3, 2020

Merge pull request #20 from cisagov/improvement/dynamic_python_version

1f15ee7

Update Lambda Building and Related GHA Job

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

cisagovbot commented Jun 18, 2020 •

edited by mcdonnnj

Loading

Uh oh!

lgtm-com bot commented Jun 18, 2020

Uh oh!

jsf9k left a comment

Uh oh!

mcdonnnj commented Jun 19, 2020

Uh oh!

jsf9k commented Jun 19, 2020 •

edited

Loading

Uh oh!

jsf9k commented Jun 19, 2020

Uh oh!

mcdonnnj commented Jun 19, 2020 •

edited

Loading

Uh oh!

dav3r left a comment

Uh oh!

mcdonnnj left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

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

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

Uh oh!

Conversation

cisagovbot commented Jun 18, 2020 • edited by mcdonnnj Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Lineage Pull Request: CONFLICT

How to resolve the conflicts

Uh oh!

lgtm-com bot commented Jun 18, 2020

Uh oh!

jsf9k left a comment

Choose a reason for hiding this comment

Uh oh!

mcdonnnj commented Jun 19, 2020

Uh oh!

jsf9k commented Jun 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jsf9k commented Jun 19, 2020

Uh oh!

mcdonnnj commented Jun 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dav3r left a comment

Choose a reason for hiding this comment

Uh oh!

mcdonnnj left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

cisagovbot commented Jun 18, 2020 •

edited by mcdonnnj

Loading

jsf9k commented Jun 19, 2020 •

edited

Loading

mcdonnnj commented Jun 19, 2020 •

edited

Loading