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

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

@@ -8,6 +8,24 @@
 
 [//]: # (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 }
+
+- Added a synchronous upload API.
+  [#933](https://github.com/pulp/pulp_python/issues/933)
+
+---
+
 ## 3.18.0 (2025-08-13) {: #3.18.0 }
 
 #### Features {: #3.18.0-feature }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.18.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
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pulpcore<3.100,>=3.49.0
+Requires-Dist: pulpcore<3.100,>=3.81.0
 Requires-Dist: pkginfo<1.13.0,>=1.12.0
 Requires-Dist: bandersnatch<6.6,>=6.3.0
 Requires-Dist: pypi-simple<2.0,>=1.5.0

{pulp_python-3.18.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.18.0"
+    version = "3.19.1"
     python_package_name = "pulp-python"
     domain_compatible = True
 

pulp_python-3.19.1/pulp_python/app/migrations/0015_alter_pythonpackagecontent_options.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.23 on 2025-08-19 17:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("python", "0014_pythonpackagecontent_dynamic_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="pythonpackagecontent",
+            options={
+                "default_related_name": "%(app_label)s_%(model_name)s",
+                "permissions": [
+                    ("upload_python_packages", "Can upload Python packages using synchronous API.")
+                ],
+            },
+        ),
+    ]

{pulp_python-3.18.0 → pulp_python-3.19.1}/pulp_python/app/models.py

@@ -227,6 +227,9 @@ class PythonPackageContent(Content):
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
         unique_together = ("sha256", "_pulp_domain")
+        permissions = [
+            ("upload_python_packages", "Can upload Python packages using synchronous API."),
+        ]
 
 
 class PythonPublication(Publication, AutoAddObjPermsMixin):

{pulp_python-3.18.0 → pulp_python-3.19.1}/pulp_python/app/serializers.py

@@ -1,5 +1,8 @@
+import logging
+import os
 from gettext import gettext as _
 from django.conf import settings
+from django.db.utils import IntegrityError
 from packaging.requirements import Requirement
 from rest_framework import serializers
 
@@ -8,7 +11,15 @@ from pulpcore.plugin import serializers as core_serializers
 from pulpcore.plugin.util import get_domain
 
 from pulp_python.app import models as python_models
-from pulp_python.app.utils import artifact_to_python_content_data
+from pulp_python.app.utils import (
+    DIST_EXTENSIONS,
+    artifact_to_python_content_data,
+    get_project_metadata_from_file,
+    parse_project_metadata,
+)
+
+
+log = logging.getLogger(__name__)
 
 
 class PythonRepositorySerializer(core_serializers.RepositorySerializer):
@@ -207,7 +218,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
         required=False,
         allow_blank=True,
         help_text=_(
-            "The Python version(s) that the distribution is guaranteed to be " "compatible with."
+            "The Python version(s) that the distribution is guaranteed to be compatible with."
         ),
     )
     # Version 2.1
@@ -215,7 +226,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
         required=False,
         allow_blank=True,
         help_text=_(
-            "A string stating the markup syntax (if any) used in the distribution’s"
+            "A string stating the markup syntax (if any) used in the distribution's"
             " description, so that tools can intelligently render the description."
         ),
     )
@@ -256,7 +267,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
     )
     packagetype = serializers.CharField(
         help_text=_(
-            "The type of the distribution package " "(e.g. sdist, bdist_wheel, bdist_egg, etc)"
+            "The type of the distribution package (e.g. sdist, bdist_wheel, bdist_egg, etc)"
         ),
         read_only=True,
     )
@@ -357,6 +368,70 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
         model = python_models.PythonPackageContent
 
 
+class PythonPackageContentUploadSerializer(PythonPackageContentSerializer):
+    """
+    A serializer for requests to synchronously upload Python packages.
+    """
+
+    def validate(self, data):
+        """
+        Validates an uploaded Python package file, extracts its metadata,
+        and creates or retrieves an associated Artifact.
+
+        Returns updated data with artifact and metadata details.
+        """
+        file = data.pop("file")
+        filename = file.name
+
+        for ext, packagetype in DIST_EXTENSIONS.items():
+            if filename.endswith(ext):
+                break
+        else:
+            raise serializers.ValidationError(
+                _(
+                    "Extension on {} is not a valid python extension "
+                    "(.whl, .exe, .egg, .tar.gz, .tar.bz2, .zip)"
+                ).format(filename)
+            )
+
+        # Replace the incorrect file name in the file path with the original file name
+        original_filepath = file.file.name
+        path_to_file, tmp_str = original_filepath.rsplit("/", maxsplit=1)
+        tmp_str = tmp_str.split(".", maxsplit=1)[0]  # Remove e.g. ".upload.gz" suffix
+        new_filepath = f"{path_to_file}/{tmp_str}{filename}"
+        os.rename(original_filepath, new_filepath)
+
+        metadata = get_project_metadata_from_file(new_filepath)
+        artifact = core_models.Artifact.init_and_validate(new_filepath)
+        try:
+            artifact.save()
+        except IntegrityError:
+            artifact = core_models.Artifact.objects.get(
+                sha256=artifact.sha256, pulp_domain=get_domain()
+            )
+            artifact.touch()
+            log.info(f"Artifact for {file.name} already existed in database")
+
+        data["artifact"] = artifact
+        data["sha256"] = artifact.sha256
+        data["relative_path"] = filename
+        data.update(parse_project_metadata(vars(metadata)))
+        # Overwrite filename from metadata
+        data["filename"] = filename
+        return data
+
+    class Meta(PythonPackageContentSerializer.Meta):
+        # This API does not support uploading to a repository or using a custom relative_path
+        fields = tuple(
+            f
+            for f in PythonPackageContentSerializer.Meta.fields
+            if f not in ["repository", "relative_path"]
+        )
+        model = python_models.PythonPackageContent
+        # Name used for the OpenAPI request object
+        ref_name = "PythonPackageContentUpload"
+
+
 class MinimalPythonPackageContentSerializer(PythonPackageContentSerializer):
     """
     A Serializer for PythonPackageContent.
@@ -503,7 +578,7 @@ class PythonPublicationSerializer(core_serializers.PublicationSerializer):
 
     distributions = core_serializers.DetailRelatedField(
         help_text=_(
-            "This publication is currently being hosted as configured by these " "distributions."
+            "This publication is currently being hosted as configured by these distributions."
         ),
         source="distribution_set",
         view_name="pythondistributions-detail",

{pulp_python-3.18.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.18.0 → pulp_python-3.19.1}/pulp_python/app/utils.py

@@ -162,7 +162,7 @@ def parse_metadata(project, version, distribution):
     return package
 
 
-def get_project_metadata_from_artifact(filename, artifact):
+def get_project_metadata_from_file(filename):
     """
     Gets the metadata of a Python Package.
 
@@ -173,30 +173,31 @@ def get_project_metadata_from_artifact(filename, artifact):
     # If no supported extension is found, ValueError is raised here
     pkg_type_index = [filename.endswith(ext) for ext in extensions].index(True)
     packagetype = DIST_EXTENSIONS[extensions[pkg_type_index]]
-    # Copy file to a temp directory under the user provided filename, we do this
-    # because pkginfo validates that the filename has a valid extension before
-    # reading it
-    with tempfile.NamedTemporaryFile("wb", dir=".", suffix=filename) as temp_file:
-        shutil.copyfileobj(artifact.file, temp_file)
-        temp_file.flush()
-        metadata = DIST_TYPES[packagetype](temp_file.name)
-        metadata.packagetype = packagetype
-        if packagetype == "sdist":
-            metadata.python_version = "source"
-        else:
-            pyver = ""
-            regex = DIST_REGEXES[extensions[pkg_type_index]]
-            if bdist_name := regex.match(filename):
-                pyver = bdist_name.group("pyver") or ""
-            metadata.python_version = pyver
-        return metadata
+
+    metadata = DIST_TYPES[packagetype](filename)
+    metadata.packagetype = packagetype
+    if packagetype == "sdist":
+        metadata.python_version = "source"
+    else:
+        pyver = ""
+        regex = DIST_REGEXES[extensions[pkg_type_index]]
+        if bdist_name := regex.match(filename):
+            pyver = bdist_name.group("pyver") or ""
+        metadata.python_version = pyver
+    return metadata
 
 
 def artifact_to_python_content_data(filename, artifact, domain=None):
     """
     Takes the artifact/filename and returns the metadata needed to create a PythonPackageContent.
     """
-    metadata = get_project_metadata_from_artifact(filename, artifact)
+    # Copy file to a temp directory under the user provided filename, we do this
+    # because pkginfo validates that the filename has a valid extension before
+    # reading it
+    with tempfile.NamedTemporaryFile("wb", dir=".", suffix=filename) as temp_file:
+        shutil.copyfileobj(artifact.file, temp_file)
+        temp_file.flush()
+        metadata = get_project_metadata_from_file(temp_file.name)
     data = parse_project_metadata(vars(metadata))
     data["sha256"] = artifact.sha256
     data["filename"] = filename

{pulp_python-3.18.0 → pulp_python-3.19.1}/pulp_python/app/viewsets.py

@@ -1,4 +1,5 @@
 from bandersnatch.configuration import BandersnatchConfig
+from django.db import transaction
 from drf_spectacular.utils import extend_schema
 from rest_framework import status
 from rest_framework.decorators import action
@@ -355,10 +356,49 @@ class PythonPackageSingleArtifactContentUploadViewSet(
                     "has_upload_param_model_or_domain_or_obj_perms:core.change_upload",
                 ],
             },
+            {
+                "action": ["upload"],
+                "principal": "authenticated",
+                "effect": "allow",
+                "condition": [
+                    "has_model_or_domain_perms:python.upload_python_packages",
+                ],
+            },
         ],
         "queryset_scoping": {"function": "scope_queryset"},
     }
 
+    LOCKED_ROLES = {
+        "python.python_package_uploader": [
+            "python.upload_python_packages",
+        ],
+    }
+
+    @extend_schema(
+        summary="Synchronous Python package upload",
+        request=python_serializers.PythonPackageContentUploadSerializer,
+        responses={201: python_serializers.PythonPackageContentSerializer},
+    )
+    @action(
+        detail=False,
+        methods=["post"],
+        serializer_class=python_serializers.PythonPackageContentUploadSerializer,
+    )
+    def upload(self, request):
+        """
+        Create a Python package.
+        """
+        serializer = self.get_serializer(data=request.data)
+
+        with transaction.atomic():
+            # Create the artifact
+            serializer.is_valid(raise_exception=True)
+            # Create the package
+            serializer.save()
+
+        headers = self.get_success_headers(serializer.data)
+        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+
 
 class PythonRemoteViewSet(core_viewsets.RemoteViewSet, core_viewsets.RolesMixin):
     """

{pulp_python-3.18.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.18.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.18.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.1/pulp_python/tests/functional/api/test_upload.py

@@ -0,0 +1,44 @@
+import pytest
+from pulp_python.tests.functional.constants import (
+    PYTHON_EGG_FILENAME,
+    PYTHON_EGG_URL,
+    PYTHON_WHEEL_FILENAME,
+    PYTHON_WHEEL_URL,
+)
+
+
+@pytest.mark.parametrize(
+    "pkg_filename, pkg_url",
+    [(PYTHON_WHEEL_FILENAME, PYTHON_WHEEL_URL), (PYTHON_EGG_FILENAME, PYTHON_EGG_URL)],
+)
+def test_synchronous_package_upload(
+    delete_orphans_pre, download_python_file, gen_user, python_bindings, pkg_filename, pkg_url
+):
+    """
+    Test synchronously uploading a Python package with labels.
+    """
+    python_file = download_python_file(pkg_filename, pkg_url)
+
+    # Upload a unit with labels
+    with gen_user(model_roles=["python.python_package_uploader"]):
+        labels = {"key_1": "value_1"}
+        content_body = {"file": python_file, "pulp_labels": labels}
+        package = python_bindings.ContentPackagesApi.upload(**content_body)
+        assert package.pulp_labels == labels
+        assert package.name == "shelf-reader"
+        assert package.filename == pkg_filename
+
+    # Check that uploading the same unit again with different (or same) labels has no effect
+    with gen_user(model_roles=["python.python_package_uploader"]):
+        labels_2 = {"key_2": "value_2"}
+        content_body_2 = {"file": python_file, "pulp_labels": labels_2}
+        duplicate_package = python_bindings.ContentPackagesApi.upload(**content_body_2)
+        assert duplicate_package.pulp_href == package.pulp_href
+        assert duplicate_package.pulp_labels == package.pulp_labels
+        assert duplicate_package.pulp_labels != labels_2
+
+    # Check that the upload fails if the user does not have the required permissions
+    with gen_user(model_roles=[]):
+        with pytest.raises(python_bindings.ApiException) as ctx:
+            python_bindings.ContentPackagesApi.upload(**content_body)
+        assert ctx.value.status == 403

{pulp_python-3.18.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.18.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
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pulpcore<3.100,>=3.49.0
+Requires-Dist: pulpcore<3.100,>=3.81.0
 Requires-Dist: pkginfo<1.13.0,>=1.12.0
 Requires-Dist: bandersnatch<6.6,>=6.3.0
 Requires-Dist: pypi-simple<2.0,>=1.5.0

{pulp_python-3.18.0 → pulp_python-3.19.1}/pulp_python.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ pulp_python/app/migrations/0011_alter_pythondistribution_distribution_ptr_and_mo
 pulp_python/app/migrations/0012_add_domain.py
 pulp_python/app/migrations/0013_add_rbac_permissions.py
 pulp_python/app/migrations/0014_pythonpackagecontent_dynamic_and_more.py
+pulp_python/app/migrations/0015_alter_pythonpackagecontent_options.py
 pulp_python/app/migrations/__init__.py
 pulp_python/app/pypi/__init__.py
 pulp_python/app/pypi/serializers.py
@@ -74,5 +75,6 @@ pulp_python/tests/functional/api/test_pypi_apis.py
 pulp_python/tests/functional/api/test_rbac.py
 pulp_python/tests/functional/api/test_repair.py
 pulp_python/tests/functional/api/test_sync.py
+pulp_python/tests/functional/api/test_upload.py
 pulp_python/tests/unit/__init__.py
 pulp_python/tests/unit/test_models.py

{pulp_python-3.18.0 → pulp_python-3.19.1}/pulp_python.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pulpcore<3.100,>=3.49.0
+pulpcore<3.100,>=3.81.0
 pkginfo<1.13.0,>=1.12.0
 bandersnatch<6.6,>=6.3.0
 pypi-simple<2.0,>=1.5.0

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

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-python"
-version = "3.18.0"
+version = "3.19.1"
 description = "pulp-python plugin for the Pulp Project"
 readme = "README.md"
 authors = [
@@ -26,7 +26,7 @@ classifiers=[
 ]
 requires-python = ">=3.11"
 dependencies = [
-  "pulpcore>=3.49.0,<3.100",
+  "pulpcore>=3.81.0,<3.100",
   "pkginfo>=1.12.0,<1.13.0",
   "bandersnatch>=6.3.0,<6.6", # 6.6 has breaking changes
   "pypi-simple>=1.5.0,<2.0",
@@ -76,7 +76,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.18.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]+))?"