Skip to content

Commit

Permalink
Merge pull request #733 from pulp/patchback/backports/3.12/781b9767da…
Browse files Browse the repository at this point in the history
…e34e8619e3831ff8ad07de1a6222ec/pr-690

[PR #690/781b9767 backport][3.12] Fix upload not supporting package metadata 2.3
  • Loading branch information
gerrod3 authored Aug 26, 2024
2 parents f3f988d + 69039e9 commit 7480c6d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES/682.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed uploads not supporting packages using metadata spec 2.3
14 changes: 14 additions & 0 deletions pulp_python/tests/functional/api/test_crud_content_unit.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest

from urllib.parse import urljoin
from pypi_simple import PyPISimple

from pulpcore.tests.functional.utils import PulpTaskError
from pulp_python.tests.functional.constants import (
Expand Down Expand Up @@ -108,3 +109,16 @@ def test_content_crud(
monitor_task(response.task)
msg = "The uploaded artifact's sha256 checksum does not match the one provided"
assert msg in e.value.task.error["description"]


@pytest.mark.parallel
def test_upload_metadata_23_spec(python_content_factory):
"""Test that packages using metadata spec 2.3 can be uploaded to pulp."""
filename = "urllib3-2.2.2-py3-none-any.whl"
with PyPISimple() as client:
page = client.get_project_page("urllib3")
for package in page.packages:
if package.filename == filename:
content = python_content_factory(filename, url=package.url)
assert content.metadata_version == "2.3"
break
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pulpcore>=3.49.0,<3.70.0
pkginfo>=1.8.2,<1.9.7
pkginfo>=1.10.0,<1.12.0 # Twine has <1.11 in their requirements
bandersnatch>=6.1,<6.2
pypi-simple>=0.9.0,<1.0.0

0 comments on commit 7480c6d

Please sign in to comment.