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 Jun 19, 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 .github/workflows/build.yml 
    git commit --message="Resolve Lineage conflicts."
    git push --force --set-upstream origin lineage/skeleton
  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 added 3 commits June 18, 2020 21:46
We claim to support Python versions 3.6, 3.7, and 3.8 in setup.py, but we only
test and build on Python 3.8. If we claim support for a version then I believe
we should be testing and building on that version to ensure "advertised"
compatibility.
In workflows using the Python version matrix we should just use the version for
that run instead of extracting the Python version from the environment.
…versions

Change test and build Action Workflows to Run Against All Supported Python Versions
@mcdonnnj mcdonnnj marked this pull request as ready for review June 19, 2020 04:21
@mcdonnnj mcdonnnj requested review from a team, dav3r, felddy, hillaryj, jsf9k and mcdonnnj as code owners June 19, 2020 04:21
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.

This is less of a change request and more of a question I'd like answered before this is merged.

It seems odd that the test portion of the build.yml workflow runs against python 3.6, 3.7, and 3.8 while the build portion of that workflow only runs against 3.8. I assume the latter is because you only want to build for the latest python version that Lambda supports, which is currently 3.8. With that in mind, is it really necessary to test against 3.7 and 3.6? Or should we build for all three versions and let the user choose which version of python to use?

Add in the skeleton-python-library build workflow and change the existing build
workflow to build_lambda. This reflects the fact that building the base code is
different from generating a lambda artifact.
@mcdonnnj
Copy link
Member

This is less of a change request and more of a question I'd like answered before this is merged.

It seems odd that the test portion of the build.yml workflow runs against python 3.6, 3.7, and 3.8 while the build portion of that workflow only runs against 3.8. I assume the latter is because you only want to build for the latest python version that Lambda supports, which is currently 3.8. With that in mind, is it really necessary to test against 3.7 and 3.6? Or should we build for all three versions and let the user choose which version of python to use?

That's a fair point. I've changed the existing build workflow to build_lambda to reflect that all it's doing is generating a lambda artifact. That process is done in a Docker container and doesn't mirror the typical Python build process. I added the cisagov/skeleton-python-library build workflow in unmolested so that the code's build is tested in addition to a lambda artifact being generated.

@mcdonnnj mcdonnnj requested a review from jsf9k June 19, 2020 15:07
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

👍 👍

@mcdonnnj mcdonnnj merged commit 64efb5f into develop Jun 19, 2020
@mcdonnnj mcdonnnj deleted the lineage/skeleton branch June 19, 2020 17:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

6 participants