Skip to content

[automated] Update plugin list#14617

Merged
nicoddemus merged 1 commit into
update-plugin-list-labelfrom
update-plugin-list/patch-f3ce3e6fa
Jun 17, 2026
Merged

[automated] Update plugin list#14617
nicoddemus merged 1 commit into
update-plugin-list-labelfrom
update-plugin-list/patch-f3ce3e6fa

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 Jun 17, 2026
@github-actions

Copy link
Copy Markdown
Contributor Author

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

@nicoddemus nicoddemus marked this pull request as ready for review June 17, 2026 12:09
@nicoddemus nicoddemus merged commit adc3bd1 into update-plugin-list-label Jun 17, 2026
3 checks passed
@nicoddemus nicoddemus deleted the update-plugin-list/patch-f3ce3e6fa branch June 17, 2026 12:11
@patchback

patchback Bot commented Jun 17, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply adc3bd1 on top of patchback/backports/9.1.x/adc3bd186962d0392db75ff60cca2186f751be1d/pr-14617

Backporting merged PR #14617 into update-plugin-list-label

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

@nicoddemus

Copy link
Copy Markdown
Member

Fixed the conflicts manually in #14618.

Now that we are in sync, hopefully the next backports will work automatically.

nicoddemus added a commit that referenced this pull request Jun 18, 2026
* update-plugin-list: fix add label command

Follow up to #14538.

* [automated] Update plugin list (#14617)

Co-authored-by: pytest bot <pytestbot@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pytest bot <pytestbot@users.noreply.github.com>
nicoddemus added a commit that referenced this pull request Jun 18, 2026
(cherry picked from commit adc3bd1)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pytest bot <pytestbot@users.noreply.github.com>
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