Skip to content

[automated] Update plugin list - #15066

Merged
Pierre-Sassoulas merged 2 commits into
mainfrom
update-plugin-list/patch-6a0de9be5
Sep 21, 2026
Merged

Pierre-Sassoulas merged 2 commits into
mainfrom
update-plugin-list/patch-6a0de9be5

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

[automated] Update plugin list

@github-actions github-actions Bot added the backport 9.1.x apply to PRs at any point; backports the changes to the 9.1.x branch label Sep 20, 2026
@github-actions

Copy link
Copy Markdown
Contributor Author

Please mark the PR as ready for review to trigger PR checks.

@Pierre-Sassoulas
Pierre-Sassoulas marked this pull request as ready for review September 21, 2026 13:05
@Pierre-Sassoulas
Pierre-Sassoulas enabled auto-merge (squash) September 21, 2026 13:06
@Pierre-Sassoulas
Pierre-Sassoulas merged commit 6a9ba0f into main Sep 21, 2026
36 checks passed
@Pierre-Sassoulas
Pierre-Sassoulas deleted the update-plugin-list/patch-6a0de9be5 branch September 21, 2026 13:25
@patchback

patchback Bot commented Sep 21, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 6a9ba0f on top of patchback/backports/9.1.x/6a9ba0f02f827a54cff6ab4da0dddecd65444ff6/pr-15066

Backporting merged PR #15066 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/9.1.x/6a9ba0f02f827a54cff6ab4da0dddecd65444ff6/pr-15066 upstream/9.1.x
    
  4. Now, cherry-pick PR [automated] Update plugin list #15066 contents into that branch:
    git cherry-pick -x 6a9ba0f02f827a54cff6ab4da0dddecd65444ff6
    
    If it'll yell at you with something like fatal: Commit 6a9ba0f02f827a54cff6ab4da0dddecd65444ff6 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 6a9ba0f02f827a54cff6ab4da0dddecd65444ff6
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR [automated] Update plugin list #15066 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/9.1.x/6a9ba0f02f827a54cff6ab4da0dddecd65444ff6/pr-15066
    
  8. 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

backport 9.1.x apply to PRs at any point; backports the changes to the 9.1.x branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants