pulp-python 3.11.2__tar.gz → 3.11.3__tar.gz

{pulp-python-3.11.2 → pulp-python-3.11.3}/CHANGES.md

@@ -8,6 +8,17 @@
 
 [//]: # (towncrier release notes start)
 
+# ## 3.11.3 (2024-08-21) {: #3.11.3 }
+
+#### Bugfixes {: #3.11.3-bugfix }
+
+- Fixed uploads not supporting packages using metadata spec 2.3
+  [#682](https://github.com/pulp/pulp_python/issues/682)
+- Fixed package name normalization issue preventing syncing packages with "." or "_" in their names.
+  [#716](https://github.com/pulp/pulp_python/issues/716)
+
+---
+
 ## 3.11.2 (2024-06-27) {: #3.11.2 }
 
 

{pulp-python-3.11.2 → pulp-python-3.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.11.2
+Version: 3.11.3
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers

{pulp-python-3.11.2 → pulp-python-3.11.3}/pulp_python/app/__init__.py

@@ -8,5 +8,5 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.11.2"
+    version = "3.11.3"
     python_package_name = "pulp-python"

{pulp-python-3.11.2 → pulp-python-3.11.3}/pulp_python/app/models.py

@@ -16,6 +16,7 @@ from pulpcore.plugin.responses import ArtifactResponse
 
 from pathlib import PurePath
 from .utils import (
+    canonicalize_name,
     get_project_metadata_from_artifact,
     parse_project_metadata,
     python_content_to_json,
@@ -84,6 +85,8 @@ class PythonDistribution(Distribution):
                         ).latest("pulp_created")
                     except ObjectDoesNotExist:
                         return None
+                    if len(path.parts) == 2:
+                        path = PurePath(f"simple/{canonicalize_name(path.parts[1])}")
                     rel_path = f"{path}/index.html"
                     try:
                         ca = (
@@ -100,8 +103,9 @@ class PythonDistribution(Distribution):
                     return ArtifactResponse(ca.artifact, headers=headers)
 
         if name:
+            normalized = canonicalize_name(name)
             package_content = PythonPackageContent.objects.filter(
-                pk__in=self.publication.repository_version.content, name__iexact=name
+                pk__in=self.publication.repository_version.content, name__normalize=normalized
             )
             # TODO Change this value to the Repo's serial value when implemented
             headers = {PYPI_LAST_SERIAL: str(PYPI_SERIAL_CONSTANT)}

{pulp-python-3.11.2 → pulp-python-3.11.3}/pulp_python/app/pypi/views.py

@@ -278,7 +278,8 @@ class MetadataView(ViewSet, PyPIMixin):
         elif meta_path.match("*/json"):
             name = meta_path.parts[0]
         if name:
-            package_content = content.filter(name__iexact=name)
+            normalized = canonicalize_name(name)
+            package_content = content.filter(name__normalize=normalized)
             # TODO Change this value to the Repo's serial value when implemented
             headers = {PYPI_LAST_SERIAL: str(PYPI_SERIAL_CONSTANT)}
             json_body = python_content_to_json(path, package_content, version=version)

{pulp-python-3.11.2 → pulp-python-3.11.3}/pulp_python/tests/functional/api/test_crud_content_unit.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 """Tests that perform actions over content unit."""
+import pytest
 from pulp_smash.pulp3.bindings import delete_orphans, monitor_task, PulpTaskError
 
 from pulp_python.tests.functional.utils import (
@@ -12,6 +13,7 @@ from pulp_python.tests.functional.utils import (
 from pulp_python.tests.functional.utils import set_up_module as setUpModule  # noqa:F401
 from tempfile import NamedTemporaryFile
 from urllib.parse import urljoin
+from pypi_simple import PyPISimple
 
 from pulp_smash.utils import http_get
 from pulp_python.tests.functional.constants import (
@@ -227,3 +229,16 @@ class ContentUnitTestCase(TestCaseUsingBindings, TestHelpersMixin):
         for k, v in expected.items():
             with self.subTest(key=k):
                 self.assertEqual(content_unit[k], v)
+
+
+@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

{pulp-python-3.11.2 → pulp-python-3.11.3}/pulp_python/tests/functional/api/test_download_content.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 """Tests that verify download of content served by Pulp."""
+import pytest
 import hashlib
 from random import choice
 from urllib.parse import urljoin
@@ -149,3 +150,32 @@ class PublishPyPIJSON(TestCaseUsingBindings, TestHelpersMixin):
 
         repo3 = self._create_repo_and_sync_with_remote(remote)
         self.assertEqual(get_content_summary(repo3.to_dict()), PYTHON_MD_FIXTURE_SUMMARY)
+
+
+@pytest.mark.parallel
+def test_pulp2pulp_sync_with_oddities(
+    python_repo_with_sync,
+    python_remote_factory,
+    python_publication_factory,
+    python_distribution_factory,
+    python_content_summary,
+):
+    """Test that Pulp can handle syncing packages with wierd names."""
+    remote = python_remote_factory(includes=["oslo.utils"], url="https://pypi.org")
+    repo = python_repo_with_sync(remote)
+    distro = python_distribution_factory(repository=repo.pulp_href)
+    summary = python_content_summary(repository_version=repo.latest_version_href)
+    # Test pulp 2 pulp full sync w/ live pypi apis
+    remote2 = python_remote_factory(includes=[], url=distro.base_url)
+    repo2 = python_repo_with_sync(remote2)
+    summary2 = python_content_summary(repository_version=repo2.latest_version_href)
+    assert summary2.present["python.python"]["count"] > 0
+    assert summary.present["python.python"]["count"] == summary2.present["python.python"]["count"]
+    # Test w/ publication
+    pub = python_publication_factory(repository=repo)
+    distro2 = python_distribution_factory(publication=pub.pulp_href)
+    remote3 = python_remote_factory(includes=[], url=distro2.base_url)
+    repo3 = python_repo_with_sync(remote3)
+    summary3 = python_content_summary(repository_version=repo3.latest_version_href)
+    assert summary3.present["python.python"]["count"] > 0
+    assert summary.present["python.python"]["count"] == summary3.present["python.python"]["count"]

{pulp-python-3.11.2 → pulp-python-3.11.3}/pulp_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.11.2
+Version: 3.11.3
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers

{pulp-python-3.11.2 → pulp-python-3.11.3}/pulp_python.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pulpcore<3.55,>=3.25.0
-pkginfo<1.9.7,>=1.8.2
+pulpcore<3.55,>=3.28
+pkginfo<1.12.0,>=1.10.0
 bandersnatch<6.2,>=6.1
 pypi-simple<1.0.0,>=0.9.0

pulp-python-3.11.3/requirements.txt

@@ -0,0 +1,4 @@
+pulpcore>=3.28,<3.55
+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

{pulp-python-3.11.2 → pulp-python-3.11.3}/setup.py

@@ -10,7 +10,7 @@ with open("README.md") as f:
 
 setup(
     name="pulp-python",
-    version="3.11.2",
+    version="3.11.3",
     description="pulp-python plugin for the Pulp Project",
     long_description=long_description,
     long_description_content_type="text/markdown",

pulp-python-3.11.2/requirements.txt

@@ -1,4 +0,0 @@
-pulpcore>=3.25.0,<3.55
-pkginfo>=1.8.2,<1.9.7
-bandersnatch>=6.1,<6.2
-pypi-simple>=0.9.0,<1.0.0