Skip to content

Fix upload not supporting package metadata 2.3 - #690

Merged
dralley merged 1 commit into
pulp:mainfrom
gerrod3:pkginfo-2.3
Jun 28, 2024
Merged

Fix upload not supporting package metadata 2.3#690
dralley merged 1 commit into
pulp:mainfrom
gerrod3:pkginfo-2.3

Conversation

@gerrod3

@gerrod3 gerrod3 commented Jun 26, 2024

Copy link
Copy Markdown
Contributor

fixes: #682

@dralley This should be safe to backport. And I'll complete full 2.3 support with #689 as a new feature for a future release.

page = client.get_project_page("urllib3")
for package in page.packages:
if package.filename == filename:
content = python_content_factory(filename, url=package.url)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I presume this downloads the file at the provided URL, then uploads it as filename?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Correct! I recently modernize the python tests and this is one of my favorite new fixtures.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice!

@dralley dralley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

My thought was that it might be best to fully support metadata 2.3 before removing the path that errors out - that way there's no possibility of losing metadata.

@gerrod3

gerrod3 commented Jun 26, 2024

Copy link
Copy Markdown
Contributor Author

My thought was that it might be best to fully support metadata 2.3 before removing the path that errors out - that way there's no possibility of losing metadata.

I don't plan on releasing the next version without full 2.3 support. But if someone is encountering this error on an older supported version, I don't want them to be without a remedy until the next version comes out.

@dralley

dralley commented Jun 26, 2024

Copy link
Copy Markdown
Contributor

Strictly speaking the user isn't without remedy at the moment, they repacked the package. Not convenient though, I agree.

If it won't require much effort to add support though though (I think it won't, working on it currently), in my opinion would be better to just do a quick major release including only 2.3 support and little else.

@gerrod3

gerrod3 commented Jun 26, 2024

Copy link
Copy Markdown
Contributor Author

We can go that way as well. I'll leave this PR as is for now, and keep a lookout on your PR.

@Derioss

Derioss commented Jun 27, 2024

Copy link
Copy Markdown

thank's for your's velocity.

@dralley

dralley commented Jun 28, 2024

Copy link
Copy Markdown
Contributor

I'm going to go ahead and merge this, then rebase on top, just to simplify things.

@dralley
dralley merged commit 781b976 into pulp:main Jun 28, 2024
@patchback

patchback Bot commented Aug 12, 2024

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 781b976 on top of patchback/backports/3.11/781b9767dae34e8619e3831ff8ad07de1a6222ec/pr-690

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

Copy link
Copy Markdown

Backport to 3.12: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.12/781b9767dae34e8619e3831ff8ad07de1a6222ec/pr-690

Backported as #733

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

gerrod3 added a commit that referenced this pull request Aug 26, 2024
…e34e8619e3831ff8ad07de1a6222ec/pr-690

[PR #690/781b9767 backport][3.12] Fix upload not supporting package metadata 2.3
@patchback

patchback Bot commented Jul 10, 2025

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 781b976 on top of patchback/backports/3.10/781b9767dae34e8619e3831ff8ad07de1a6222ec/pr-690

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

jobselko added a commit that referenced this pull request Jul 18, 2025
…67dae34e8619e3831ff8ad07de1a6222ec/pr-690

[PR #690/781b9767 backport][3.10] Fix upload not supporting package metadata 2.3
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.

Support Metadata 2.3 | update version of pkginfo

4 participants