Skip to content

Conversation

@gerrod3
Copy link
Contributor

@gerrod3 gerrod3 commented Sep 10, 2025

Remove testing of twine's --skip-existing due to twine feature removal

(cherry picked from commit 2b34643)

Remove testing of twine's --skip-existing due to twine feature removal

(cherry picked from commit 2b34643)
@gerrod3 gerrod3 merged commit 3b820bc into pulp:3.11 Sep 11, 2025
13 checks passed
@patchback
Copy link

patchback bot commented Sep 11, 2025

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 3b820bc on top of patchback/backports/3.10/3b820bc42c9da015debebb822b11f1c181bf07dc/pr-959

Backporting merged PR #959 into 3.11

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

@gerrod3 gerrod3 deleted the patchback/backports/3.11/2b34643299835462a4add6b3b76d2d8309bf91d9/pr-957 branch September 11, 2025 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants