pulp-python 3.19.0__tar.gz → 3.19.1__tar.gz

{pulp_python-3.19.0 → pulp_python-3.19.1}/CHANGES.md

@@ -8,6 +8,15 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.19.1 (2025-09-14) {: #3.19.1 }
+
+#### Bugfixes {: #3.19.1-bugfix }
+
+- Fixed publication error when package's dists contain differing versions of its name.
+  [#907](https://github.com/pulp/pulp_python/issues/907)
+
+---
+
 ## 3.19.0 (2025-08-26) {: #3.19.0 }
 
 #### Features {: #3.19.0-feature }

{pulp_python-3.19.0 → pulp_python-3.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.19.0
+Version: 3.19.1
 Summary: pulp-python plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_python-3.19.0 → pulp_python-3.19.1}/pulp_python/app/__init__.py

@@ -10,7 +10,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.19.0"
+    version = "3.19.1"
     python_package_name = "pulp-python"
     domain_compatible = True
 

{pulp_python-3.19.0 → pulp_python-3.19.1}/pulp_python/app/tasks/publish.py

@@ -59,9 +59,9 @@ def write_simple_api(publication):
         python_models.PythonPackageContent.objects.filter(
             pk__in=publication.repository_version.content, _pulp_domain=domain
         )
-        .order_by("name")
+        .order_by("name__normalize")
         .values_list("name", flat=True)
-        .distinct()
+        .distinct("name__normalize")
     )
 
     # write the root index, which lists all of the projects for which there is a package available
@@ -80,22 +80,22 @@ def write_simple_api(publication):
     packages = python_models.PythonPackageContent.objects.filter(
         pk__in=publication.repository_version.content, _pulp_domain=domain
     )
-    releases = packages.order_by("name").values("name", "filename", "sha256")
+    releases = packages.order_by("name__normalize").values("name", "filename", "sha256")
 
     ind = 0
-    current_name = project_names[ind]
+    current_name = canonicalize_name(project_names[ind])
     package_releases = []
     for release in releases.iterator():
-        if release["name"] != current_name:
+        if canonicalize_name(release["name"]) != current_name:
             write_project_page(
-                name=canonicalize_name(current_name),
+                name=current_name,
                 simple_dir=simple_dir,
                 package_releases=package_releases,
                 publication=publication,
             )
             package_releases = []
             ind += 1
-            current_name = project_names[ind]
+            current_name = canonicalize_name(project_names[ind])
         relative_path = release["filename"]
         path = f"../../{relative_path}"
         checksum = release["sha256"]

{pulp_python-3.19.0 → pulp_python-3.19.1}/pulp_python/pytest_plugin.py

@@ -178,7 +178,7 @@ def python_content_factory(python_bindings, download_python_file, monitor_task):
 
         task = python_bindings.ContentPackagesApi.create(**body).task
         response = monitor_task(task)
-        return python_bindings.ContentPackagesApi.read(response.created_resources[0])
+        return python_bindings.ContentPackagesApi.read(response.created_resources[-1])
 
     yield _gen_python_content
 

{pulp_python-3.19.0 → pulp_python-3.19.1}/pulp_python/tests/functional/api/test_crud_publications.py

@@ -1,5 +1,6 @@
 import pytest
 import random
+from pypi_simple import PyPISimple
 from urllib.parse import urljoin
 
 from pulp_python.tests.functional.constants import (
@@ -109,3 +110,29 @@ def test_new_content_is_published(python_publication_workflow, python_distributi
     url = urljoin(distro.base_url, "simple/")
     proper, msgs = ensure_simple(url, {"shelf-reader": releases})
     assert proper is True, msgs
+
+
+@pytest.mark.parallel
+def test_non_matching_canonicalized_name(
+    python_repo, python_content_factory, python_publication_factory, python_distribution_factory
+):
+    """Ensures a package with dists that have non-matching canonicalized names is published."""
+    packages = []
+    filenames = ["msg_parser-1.0.0-py2.py3-none-any.whl", "msg_parser-1.0.0.tar.gz"]
+    with PyPISimple() as client:
+        page = client.get_project_page("msg-parser")
+        for pkg in page.packages:
+            if pkg.filename in filenames:
+                c = python_content_factory(pkg.filename, url=pkg.url, repository=python_repo)
+                if c.filename.endswith(".tar.gz"):
+                    # The metadata name in the SDist is not the same as the Wheel's name
+                    assert c.name == "msg_parser"
+                else:
+                    assert c.name == "msg-parser"
+                packages.append(c)
+    pub = python_publication_factory(repository=python_repo)
+    distro = python_distribution_factory(publication=pub)
+
+    url = urljoin(distro.base_url, "simple/")
+    proper, msgs = ensure_simple(url, {"msg-parser": filenames})
+    assert proper is True, msgs

{pulp_python-3.19.0 → pulp_python-3.19.1}/pulp_python/tests/functional/api/test_pypi_apis.py

@@ -225,26 +225,6 @@ def test_twine_upload(
             check=True,
         )
 
-    # Test re-uploading same packages with --skip-existing works
-    output = subprocess.run(
-        (
-            "twine",
-            "upload",
-            "--repository-url",
-            url,
-            dist_dir / "*",
-            "-u",
-            username,
-            "-p",
-            password,
-            "--skip-existing",
-        ),
-        capture_output=True,
-        check=True,
-        text=True,
-    )
-    assert output.stdout.count("Skipping") == 2
-
 
 @pytest.mark.parallel
 def test_simple_redirect_with_publications(

{pulp_python-3.19.0 → pulp_python-3.19.1}/pulp_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.19.0
+Version: 3.19.1
 Summary: pulp-python plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_python-3.19.0 → pulp_python-3.19.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-python"
-version = "3.19.0"
+version = "3.19.1"
 description = "pulp-python plugin for the Pulp Project"
 readme = "README.md"
 authors = [
@@ -76,7 +76,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.19.0"
+current_version = "3.19.1"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"