Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 14 commits into from
Feb 9, 2023

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Feb 8, 2023

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/mongo-db-from-config.git mongo-db-from-config
    cd mongo-db-from-config
    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
    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 13 commits January 31, 2023 13:06
Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook
is intentionally held back to be updated independently to v6.
Lineage pull request for: skeleton
Retrieve the wheel to a `dist/` sub-directory and get the name of the
specific file (wheel) to be installed. Then update the installation
step to use this found filename instead of a wildcard.
When installing the wheel that was built in the `build` job we will
also install the `test` optional dependencies.
…ncies_in_test-build_gha_job

Improve testing dependency installation in the `test-build` job
Sort all pre-`steps` keys alphabetically descending. Sorting all keys
alphabetically would be somewhat onerous because the `strategy` key
would come after the `steps` key even though it's configuration
information. We can at least sort everything but the `steps` key in
alphabetically descending order and make the `steps` the last for a
job.
Add `name` keys to the `test`, `build`, and `test-build` jobs that are
both more descriptive and include the Python version from the job's
matrix. This will produce consistent and more helpful job names in the
GitHub Actions log in the GitHub web UI.
…s_using_matrix_strategy

Improve job names for the `build` workflow in GitHub Actions
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Feb 8, 2023
@jmorrowomni jmorrowomni assigned jmorrowomni and unassigned felddy, jsf9k, dav3r and mcdonnnj Feb 8, 2023
@coveralls
Copy link

Coverage Status

Coverage: 100.0%. Remained the same when pulling f4ce559 on lineage/skeleton into 67c758c on develop.

@jmorrowomni jmorrowomni marked this pull request as ready for review February 9, 2023 15:39
@jmorrowomni jmorrowomni merged commit 4e6df6e into develop Feb 9, 2023
@jmorrowomni jmorrowomni deleted the lineage/skeleton branch February 9, 2023 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream update This issue or pull request pulls in upstream updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants