Skip to content

Fix tests for twine 7.0.0 - #1305

Merged
gerrod3 merged 1 commit into
pulp:mainfrom
jobselko:pin_twine
Jul 29, 2026
Merged

Fix tests for twine 7.0.0#1305
gerrod3 merged 1 commit into
pulp:mainfrom
jobselko:pin_twine

Conversation

@jobselko

Copy link
Copy Markdown
Member

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

@jobselko

Copy link
Copy Markdown
Member Author

Twine 7.0.0 added metadata validation that rejects Metadata-Version 2.0, used in shelf-reader 0.1 (https://twine.readthedocs.io/en/stable/changelog.html#twine-7-0-0-2026-07-27). The another option to fix this would be to replace shelf-reader 0.1 in test_twine_upload with a different fixture package. @gerrod3 Dow you have a preference on this?

@gerrod3

gerrod3 commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

We should probably just swap out the package we use. We want to ensure pulp-python is always compatible with the latest twine.

@jobselko jobselko changed the title Pin twine<7 to fix test_twine_upload CI failure Fix test_twine_upload for twine 7.0.0 Jul 28, 2026
@jobselko
jobselko force-pushed the pin_twine branch 2 times, most recently from 37b2d89 to 6ff229d Compare July 28, 2026 16:16
@jobselko jobselko changed the title Fix test_twine_upload for twine 7.0.0 Fix tests for twine 7.0.0 Jul 28, 2026
@jobselko
jobselko requested a review from gerrod3 July 28, 2026 16:41
Comment thread pulp_python/tests/functional/api/test_pypi_apis.py
Assisted By: Claude Opus 4.6
@gerrod3
gerrod3 merged commit 39a603e into pulp:main Jul 29, 2026
14 checks passed
@jobselko
jobselko deleted the pin_twine branch July 29, 2026 14:03
@patchback

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 39a603e on top of patchback/backports/3.11/39a603e262c9cc7fb5116c62742a33d366833563/pr-1305

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

@patchback

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 39a603e on top of patchback/backports/3.12/39a603e262c9cc7fb5116c62742a33d366833563/pr-1305

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

@patchback

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 39a603e on top of patchback/backports/3.13/39a603e262c9cc7fb5116c62742a33d366833563/pr-1305

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

@patchback

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

Backport to 3.27: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.27/39a603e262c9cc7fb5116c62742a33d366833563/pr-1305

Backported as #1308

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

@patchback

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 39a603e on top of patchback/backports/3.19/39a603e262c9cc7fb5116c62742a33d366833563/pr-1305

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

@patchback

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

Backport to 3.32: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.32/39a603e262c9cc7fb5116c62742a33d366833563/pr-1305

Backported as #1309

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

jobselko added a commit to jobselko/pulp_python that referenced this pull request Jul 29, 2026
Follow-up to pulp#1305 to fix older branches
gerrod3 pushed a commit that referenced this pull request Jul 29, 2026
Follow-up to #1305 to fix older branches
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