Skip to content
This repository was archived by the owner on Dec 1, 2022. It is now read-only.

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Nov 18, 2020

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/skeleton-aws-lambda.git skeleton-aws-lambda
    cd skeleton-aws-lambda
    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 setup.py src/example/__init__.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

jsf9k and others added 19 commits November 3, 2020 12:46
This additional clause must remain at the _end_ of the CODEOWNERS file
so that it cannot be overridden by a later clause.

We want to make it so that all the .github files including CODEOWNERS
are protected so only code owners (the dev team) can approve
modifications to them.

This will prevent configuration changes from breaking Actions and
other management-type functions that the files in this directory
control. By setting the .github files/folder to require code owner
approval for changes, workflow and management changes will require dev
team review and checking.

Resolves #56.
Thanks to @dav3r and @mcdonnnj for the suggestion.
There is no need to run python code to determine the python version.
Resolves #58.

See here for details:
https://github.com/actions/setup-python/blob/main/action.yml#L14-L16
Sort the install_requires and extras_require["test"] arguments by key.
Group related pre-commit hooks together. Make sure that hooks are
alphabetically sorted within those groups.
Switch to the file line reading version of extracting the version from
https://packaging.python.org/guides/single-sourcing-package-version/
instead of the exec method on the same page. The exec method required us to use
a "# nosec" to manually disable Bandit checking on that line. Although that
method is more straightforward, I do not feel that it is worth using an exec in
the codebase when another option is available.
…gihub-dir

Ensure that the cisagov devs are the owners of the .github directory
…re-simply

Use the python version output by actions/setup-python
Also updated the test and build jobs in the build workflow to mirror cache key
format changes in the lint job.
⚠️ CONFLICT! Lineage pull request for: skeleton
Sort the Package Requirements in setup.py
Remove or Explain Manual Testing Check Disables
@lgtm-com
Copy link

lgtm-com bot commented Nov 18, 2020

This pull request introduces 1 alert when merging 4ea3c2a into e783b26 - view on LGTM.com

new alerts:

  • 1 for Syntax error

@mcdonnnj mcdonnnj marked this pull request as ready for review November 19, 2020 21:07
Copy link
Member

@jsf9k jsf9k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@hillaryj hillaryj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsf9k
Copy link
Member

jsf9k commented Nov 24, 2020

I saw that some lambda builds were failing, so I investigated and saw that this PR is still unmerged. Is there any reason not to merge this one?

@mcdonnnj
Copy link
Member

I saw that some lambda builds were failing, so I investigated and saw that this PR is still unmerged. Is there any reason not to merge this one?

I made some changes here that I kicked upstream to cisagov/skeleton-python-library#62. I was originally going to merge that alone and resolve all the dependencies, but then I did cisagov/skeleton-generic#62 which complicated that plan. I will revert the semver changes I did here and merge things to match how they are in cisagov/skeleton-python-library now.

Also replace a dangling yamllint error in docker-compose.yml.
@mcdonnnj mcdonnnj merged commit cd7eb87 into develop Nov 24, 2020
@mcdonnnj mcdonnnj deleted the lineage/skeleton branch November 24, 2020 16:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants