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

[pre-commit.ci] pre-commit autoupdate #12558

Merged
merged 5 commits into from
Jul 4, 2024

Conversation

pre-commit-ci[bot]
Copy link
Contributor

@pre-commit-ci pre-commit-ci bot commented Jul 2, 2024

@Pierre-Sassoulas Pierre-Sassoulas self-assigned this Jul 2, 2024
pre-commit-ci bot and others added 2 commits July 4, 2024 11:10
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.10 → v0.5.0](astral-sh/ruff-pre-commit@v0.4.10...v0.5.0)
- [github.com/adamchainz/blacken-docs: 1.16.0 → 1.18.0](adamchainz/blacken-docs@1.16.0...1.18.0)
- [github.com/pre-commit/mirrors-mypy: v1.10.0 → v1.10.1](pre-commit/mirrors-mypy@v1.10.0...v1.10.1)
- pyproject-fmt: 2.1.3 => 2.1.4

Co-authored-by: Pierre Sassoulas <[email protected]>
@Pierre-Sassoulas Pierre-Sassoulas force-pushed the pre-commit-ci-update-config branch 2 times, most recently from a75ddc0 to 8beb154 Compare July 4, 2024 09:27
@Pierre-Sassoulas Pierre-Sassoulas force-pushed the pre-commit-ci-update-config branch from 8beb154 to b2908fd Compare July 4, 2024 09:30
Closes #12552
Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

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

Thanks!

@Pierre-Sassoulas Pierre-Sassoulas merged commit e19ad1f into main Jul 4, 2024
29 checks passed
@Pierre-Sassoulas Pierre-Sassoulas deleted the pre-commit-ci-update-config branch July 4, 2024 18:46
Copy link

patchback bot commented Jul 4, 2024

Backport to 8.2.x: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply e19ad1f on top of patchback/backports/8.2.x/e19ad1f7a11ab51d020107dcbbf588db8cee669f/pr-12558

Backporting merged PR #12558 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pytest-dev/pytest.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/8.2.x/e19ad1f7a11ab51d020107dcbbf588db8cee669f/pr-12558 upstream/8.2.x
  4. Now, cherry-pick PR [pre-commit.ci] pre-commit autoupdate #12558 contents into that branch:
    $ git cherry-pick -x e19ad1f7a11ab51d020107dcbbf588db8cee669f
    If it'll yell at you with something like fatal: Commit e19ad1f7a11ab51d020107dcbbf588db8cee669f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x e19ad1f7a11ab51d020107dcbbf588db8cee669f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [pre-commit.ci] pre-commit autoupdate #12558 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/8.2.x/e19ad1f7a11ab51d020107dcbbf588db8cee669f/pr-12558
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Python 3.13.0b3] Address a deprecated call in testing/python/fixtures.py::test_getfuncargnames_partial
3 participants