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

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

@@ -8,6 +8,21 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.19.2 (2026-04-28) {: #3.19.2 }
+
+No significant changes.
+
+---
+
+## 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.2}/MANIFEST.in

@@ -10,3 +10,5 @@ include test_requirements.txt
 include unittest_requirements.txt
 include pulp_python/app/webserver_snippets/*
 exclude releasing.md
+
+exclude .gitleaks.toml

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.19.0
+Version: 3.19.2
 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.81.0
+Requires-Dist: pulpcore<3.100,>=3.85.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.19.0 → pulp_python-3.19.2}/pulp_python/app/__init__.py

@@ -1,6 +1,8 @@
+from gettext import gettext as _
+
 from django.db.models.signals import post_migrate
+
 from pulpcore.plugin import PulpPluginAppConfig
-from gettext import gettext as _
 
 
 class PulpPythonPluginAppConfig(PulpPluginAppConfig):
@@ -10,7 +12,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.19.0"
+    version = "3.19.2"
     python_package_name = "pulp-python"
     domain_compatible = True
 
@@ -26,7 +28,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
 # TODO: Remove this when https://github.com/pulp/pulpcore/issues/5500 is resolved
 def _populate_pypi_access_policies(sender, apps, verbosity, **kwargs):
-    from pulp_python.app.pypi.views import PyPIView, SimpleView, UploadView, MetadataView
+    from pulp_python.app.pypi.views import MetadataView, PyPIView, SimpleView, UploadView
 
     try:
         AccessPolicy = apps.get_model("core", "AccessPolicy")

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/global_access_conditions.py

@@ -1,6 +1,5 @@
 from django.conf import settings
 
-
 # Access Condition methods that can be used with PyPI access policies
 
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/management/commands/repair-python-metadata.py

@@ -1,11 +1,12 @@
-import re
 import os
-from django.core.management import BaseCommand, CommandError
+import re
 from gettext import gettext as _
 
 from django.conf import settings
+from django.core.management import BaseCommand, CommandError
 
 from pulpcore.plugin.util import extract_pk
+
 from pulp_python.app.models import PythonPackageContent, PythonRepository
 from pulp_python.app.utils import artifact_to_python_content_data
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/modelresource.py

@@ -1,6 +1,7 @@
 from pulpcore.plugin.importexport import BaseContentResource
 from pulpcore.plugin.modelresources import RepositoryResource
 from pulpcore.plugin.util import get_domain
+
 from pulp_python.app.models import (
     PythonPackageContent,
     PythonRepository,

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/models.py

@@ -1,30 +1,31 @@
 from logging import getLogger
+from pathlib import PurePath
 
 from aiohttp.web import json_response
+from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
-from django.conf import settings
+
 from pulpcore.plugin.models import (
     AutoAddObjPermsMixin,
     Content,
-    Publication,
     Distribution,
+    Publication,
     Remote,
     Repository,
 )
+from pulpcore.plugin.repo_version_utils import remove_duplicates, validate_repo_version
 from pulpcore.plugin.responses import ArtifactResponse
+from pulpcore.plugin.util import get_domain, get_domain_pk
 
-from pathlib import PurePath
 from .utils import (
+    PYPI_LAST_SERIAL,
+    PYPI_SERIAL_CONSTANT,
     artifact_to_python_content_data,
     canonicalize_name,
     python_content_to_json,
-    PYPI_LAST_SERIAL,
-    PYPI_SERIAL_CONSTANT,
 )
-from pulpcore.plugin.repo_version_utils import remove_duplicates, validate_repo_version
-from pulpcore.plugin.util import get_domain_pk, get_domain
 
 log = getLogger(__name__)
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/pypi/serializers.py

@@ -1,11 +1,13 @@
 import logging
 from gettext import gettext as _
 
+from django.db.utils import IntegrityError
 from rest_framework import serializers
-from pulp_python.app.utils import DIST_EXTENSIONS
+
 from pulpcore.plugin.models import Artifact
 from pulpcore.plugin.util import get_domain
-from django.db.utils import IntegrityError
+
+from pulp_python.app.utils import DIST_EXTENSIONS
 
 log = logging.getLogger(__name__)
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/pypi/views.py

@@ -1,57 +1,56 @@
 import json
 import logging
+from datetime import datetime, timedelta, timezone
+from itertools import chain
+from pathlib import PurePath
+from urllib.parse import urljoin, urlparse, urlunsplit
 
 from aiohttp.client_exceptions import ClientError
-from rest_framework.viewsets import ViewSet
-from rest_framework.response import Response
-from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import redirect
-from datetime import datetime, timezone, timedelta
-
 from django.contrib.sessions.models import Session
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
 from django.db.utils import DatabaseError
 from django.http.response import (
     Http404,
-    HttpResponseForbidden,
+    HttpResponse,
     HttpResponseBadRequest,
+    HttpResponseForbidden,
     StreamingHttpResponse,
-    HttpResponse,
 )
+from django.shortcuts import redirect
 from drf_spectacular.utils import extend_schema
 from dynaconf import settings
-from itertools import chain
 from packaging.utils import canonicalize_name
-from urllib.parse import urljoin, urlparse, urlunsplit
-from pathlib import PurePath
 from pypi_simple import ACCEPT_JSON_PREFERRED, ProjectPage
+from rest_framework.response import Response
+from rest_framework.viewsets import ViewSet
 
-from pulpcore.plugin.viewsets import OperationPostponedResponse
+from pulpcore.plugin.exceptions import TimeoutException
 from pulpcore.plugin.tasking import dispatch
 from pulpcore.plugin.util import get_domain, get_url
-from pulpcore.plugin.exceptions import TimeoutException
+from pulpcore.plugin.viewsets import OperationPostponedResponse
+
+from pulp_python.app import tasks
 from pulp_python.app.models import (
     PythonDistribution,
     PythonPackageContent,
     PythonPublication,
 )
 from pulp_python.app.pypi.serializers import (
-    SummarySerializer,
     PackageMetadataSerializer,
     PackageUploadSerializer,
     PackageUploadTaskSerializer,
+    SummarySerializer,
 )
 from pulp_python.app.utils import (
-    write_simple_index,
-    write_simple_detail,
-    python_content_to_json,
     PYPI_LAST_SERIAL,
     PYPI_SERIAL_CONSTANT,
     get_remote_package_filter,
+    python_content_to_json,
+    write_simple_detail,
+    write_simple_index,
 )
 
-from pulp_python.app import tasks
-
 log = logging.getLogger(__name__)
 
 ORIGIN_HOST = settings.CONTENT_ORIGIN if settings.CONTENT_ORIGIN else settings.PYPI_API_HOSTNAME

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/replica.py

@@ -1,10 +1,11 @@
-from pulpcore.plugin.replica import Replicator
-
 from pulp_glue.python.context import (
     PulpPythonDistributionContext,
     PulpPythonPublicationContext,
     PulpPythonRepositoryContext,
 )
+
+from pulpcore.plugin.replica import Replicator
+
 from pulp_python.app.models import PythonDistribution, PythonRemote, PythonRepository
 from pulp_python.app.tasks import sync as python_sync
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/serializers.py

@@ -1,6 +1,7 @@
 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
@@ -18,7 +19,6 @@ from pulp_python.app.utils import (
     parse_project_metadata,
 )
 
-
 log = logging.getLogger(__name__)
 
 
@@ -165,7 +165,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
         required=False,
         allow_blank=True,
         help_text=_(
-            "The maintainer's name at a minimum; " "additional contact information may be provided."
+            "The maintainer's name at a minimum; additional contact information may be provided."
         ),
     )
     maintainer_email = serializers.CharField(
@@ -489,7 +489,7 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
     package_types = MultipleChoiceArrayField(
         required=False,
         help_text=_(
-            "The package types to sync for Python content. Leave blank to get every" "package type."
+            "The package types to sync for Python content. Leave blank to get everypackage type."
         ),
         choices=python_models.PACKAGE_TYPES,
         default=list,
@@ -519,7 +519,7 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
                 Requirement(pkg)
             except ValueError as ve:
                 raise serializers.ValidationError(
-                    _("includes specifier {} is invalid. {}".format(pkg, ve))
+                    _("includes specifier {} is invalid. {}").format(pkg, ve)
                 )
         return value
 
@@ -530,7 +530,7 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
                 Requirement(pkg)
             except ValueError as ve:
                 raise serializers.ValidationError(
-                    _("excludes specifier {} is invalid. {}".format(pkg, ve))
+                    _("excludes specifier {} is invalid. {}").format(pkg, ve)
                 )
         return value
 

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

@@ -1,6 +1,6 @@
-from gettext import gettext as _
 import logging
 import os
+from gettext import gettext as _
 
 from django.core.files import File
 from packaging.utils import canonicalize_name
@@ -9,8 +9,7 @@ from pulpcore.plugin import models
 from pulpcore.plugin.util import get_domain
 
 from pulp_python.app import models as python_models
-from pulp_python.app.utils import write_simple_index, write_simple_detail
-
+from pulp_python.app.utils import write_simple_detail, write_simple_index
 
 log = logging.getLogger(__name__)
 
@@ -59,9 +58,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 +79,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.2}/pulp_python/app/tasks/repair.py

@@ -6,14 +6,16 @@ from uuid import UUID
 
 from django.db.models import Prefetch
 from django.db.models.query import QuerySet
+
+from pulpcore.plugin.models import ContentArtifact, ProgressReport
+from pulpcore.plugin.util import get_domain
+
 from pulp_python.app.models import PythonPackageContent, PythonRepository
 from pulp_python.app.utils import (
     artifact_to_python_content_data,
     fetch_json_release_metadata,
     parse_metadata,
 )
-from pulpcore.plugin.models import ContentArtifact, ProgressReport
-from pulpcore.plugin.util import get_domain
 
 log = logging.getLogger(__name__)
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/tasks/sync.py

@@ -1,10 +1,15 @@
 import logging
-
-from aiohttp import ClientResponseError, ClientError
-from lxml.etree import LxmlError
-from gettext import gettext as _
 from functools import partial
+from gettext import gettext as _
+from urllib.parse import urljoin
 
+from aiohttp import ClientError, ClientResponseError
+from bandersnatch.configuration import BandersnatchConfig
+from bandersnatch.master import Master
+from bandersnatch.mirror import Mirror
+from lxml.etree import LxmlError
+from packaging.requirements import Requirement
+from pypi_simple import IndexPage
 from rest_framework import serializers
 
 from pulpcore.plugin.download import HttpDownloader
@@ -20,14 +25,7 @@ from pulp_python.app.models import (
     PythonPackageContent,
     PythonRemote,
 )
-from pulp_python.app.utils import parse_metadata, PYPI_LAST_SERIAL
-from pypi_simple import IndexPage
-
-from bandersnatch.mirror import Mirror
-from bandersnatch.master import Master
-from bandersnatch.configuration import BandersnatchConfig
-from packaging.requirements import Requirement
-from urllib.parse import urljoin
+from pulp_python.app.utils import PYPI_LAST_SERIAL, parse_metadata
 
 logger = logging.getLogger(__name__)
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/tasks/upload.py

@@ -1,9 +1,10 @@
 import time
-
 from datetime import datetime, timezone
-from django.db import transaction
+
 from django.contrib.sessions.models import Session
-from pulpcore.plugin.models import Artifact, CreatedResource, ContentArtifact
+from django.db import transaction
+
+from pulpcore.plugin.models import Artifact, ContentArtifact, CreatedResource
 from pulpcore.plugin.util import get_domain
 
 from pulp_python.app.models import PythonPackageContent, PythonRepository

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/urls.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.urls import path
 
-from pulp_python.app.pypi.views import SimpleView, MetadataView, PyPIView, UploadView
+from pulp_python.app.pypi.views import MetadataView, PyPIView, SimpleView, UploadView
 
 if settings.DOMAIN_ENABLED:
     PYPI_API_URL = "pypi/<slug:pulp_domain>/<path:path>/"

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/app/utils.py

@@ -1,16 +1,17 @@
-import pkginfo
+import json
 import re
 import shutil
 import tempfile
-import json
 from collections import defaultdict
+
+import pkginfo
 from django.conf import settings
 from jinja2 import Template
-from packaging.utils import canonicalize_name
 from packaging.requirements import Requirement
-from packaging.version import parse, InvalidVersion
-from pulpcore.plugin.models import Remote
+from packaging.utils import canonicalize_name
+from packaging.version import InvalidVersion, parse
 
+from pulpcore.plugin.models import Remote
 
 PYPI_LAST_SERIAL = "X-PYPI-LAST-SERIAL"
 """TODO This serial constant is temporary until Python repositories implements serials"""

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

@@ -1,16 +1,17 @@
-import pytest
-import uuid
 import subprocess
+import uuid
+
+import pytest
 
 from pulpcore.tests.functional.utils import BindingsNamespace
+
 from pulp_python.tests.functional.constants import (
-    PYTHON_FIXTURE_URL,
-    PYTHON_XS_PROJECT_SPECIFIER,
     PYTHON_EGG_FILENAME,
+    PYTHON_FIXTURE_URL,
     PYTHON_URL,
+    PYTHON_XS_PROJECT_SPECIFIER,
 )
 
-
 # Bindings API Fixtures
 
 
@@ -178,7 +179,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.2}/pulp_python/tests/functional/api/test_consume_content.py

@@ -1,5 +1,4 @@
 import subprocess
-
 from urllib.parse import urlsplit
 
 
@@ -21,6 +20,7 @@ def test_pip_consume_content(
         "install",
         "--no-deps",
         "--no-cache-dir",
+        "--no-build-isolation",
         "--force-reinstall",
         "--trusted-host",
         urlsplit(distro.base_url).hostname,

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_crud_content_unit.py

@@ -1,14 +1,15 @@
-import pytest
-
 from urllib.parse import urljoin
+
+import pytest
 from pypi_simple import PyPISimple
 
 from pulpcore.tests.functional.utils import PulpTaskError
+
 from pulp_python.tests.functional.constants import (
-    PYTHON_FIXTURES_URL,
-    PYTHON_PACKAGE_DATA,
     PYTHON_EGG_FILENAME,
     PYTHON_EGG_URL,
+    PYTHON_FIXTURES_URL,
+    PYTHON_PACKAGE_DATA,
     PYTHON_SM_FIXTURE_CHECKSUMS,
 )
 

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

@@ -1,12 +1,14 @@
-import pytest
 import random
 from urllib.parse import urljoin
 
+import pytest
+from pypi_simple import PyPISimple
+
 from pulp_python.tests.functional.constants import (
-    PYTHON_SM_PROJECT_SPECIFIER,
-    PYTHON_SM_FIXTURE_RELEASES,
-    PYTHON_SM_FIXTURE_CHECKSUMS,
     PYTHON_EGG_FILENAME,
+    PYTHON_SM_FIXTURE_CHECKSUMS,
+    PYTHON_SM_FIXTURE_RELEASES,
+    PYTHON_SM_PROJECT_SPECIFIER,
     PYTHON_WHEEL_FILENAME,
 )
 from pulp_python.tests.functional.utils import ensure_simple
@@ -109,3 +111,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.2}/pulp_python/tests/functional/api/test_crud_remotes.py

@@ -1,11 +1,12 @@
-import pytest
 import uuid
 
+import pytest
+
 from pulp_python.tests.functional.constants import (
     BANDERSNATCH_CONF,
     DEFAULT_BANDER_REMOTE_BODY,
-    PYTHON_INVALID_SPECIFIER_NO_NAME,
     PYTHON_INVALID_SPECIFIER_BAD_VERSION,
+    PYTHON_INVALID_SPECIFIER_NO_NAME,
     PYTHON_VALID_SPECIFIER_NO_VERSION,
 )
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_domains.py

@@ -1,17 +1,17 @@
-import pytest
-import uuid
 import json
 import subprocess
+import uuid
+from urllib.parse import urlsplit
+
+import pytest
 
-from pulpcore.app import settings
+from pulpcore.app import settings  # noqa: TID251
 
 from pulp_python.tests.functional.constants import (
     PYTHON_EGG_FILENAME,
-    PYTHON_SM_PROJECT_SPECIFIER,
     PYTHON_SM_PACKAGE_COUNT,
+    PYTHON_SM_PROJECT_SPECIFIER,
 )
-from urllib.parse import urlsplit
-
 
 pytestmark = pytest.mark.skipif(not settings.DOMAIN_ENABLED, reason="Domain not enabled")
 
@@ -270,6 +270,7 @@ def test_domain_pypi_apis(
             "pip",
             "install",
             "--no-deps",
+            "--no-build-isolation",
             "--trusted-host",
             urlsplit(distro.base_url).hostname,
             "-i",

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_export_import.py

@@ -5,16 +5,17 @@ NOTE: assumes ALLOWED_EXPORT_PATHS setting contains "/tmp" - all tests will fail
 the case.
 """
 
-import pytest
 import uuid
 
-from pulpcore.app import settings
+import pytest
+
+from pulpcore.app import settings  # noqa: TID251
+
 from pulp_python.tests.functional.constants import (
-    PYTHON_XS_PROJECT_SPECIFIER,
     PYTHON_SM_PROJECT_SPECIFIER,
+    PYTHON_XS_PROJECT_SPECIFIER,
 )
 
-
 pytestmark = [
     pytest.mark.skipif(settings.DOMAIN_ENABLED, reason="Domains do not support export."),
     pytest.mark.skipif(

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

@@ -1,27 +1,25 @@
-import pytest
-import requests
 import subprocess
-
 from urllib.parse import urljoin
 
+import pytest
+import requests
+
 from pulp_python.tests.functional.constants import (
-    PYTHON_SM_PROJECT_SPECIFIER,
-    PYTHON_SM_FIXTURE_RELEASES,
-    PYTHON_SM_FIXTURE_CHECKSUMS,
-    PYTHON_MD_PROJECT_SPECIFIER,
-    PYTHON_MD_PYPI_SUMMARY,
     PYTHON_EGG_FILENAME,
-    PYTHON_EGG_URL,
     PYTHON_EGG_SHA256,
+    PYTHON_EGG_URL,
+    PYTHON_MD_PROJECT_SPECIFIER,
+    PYTHON_MD_PYPI_SUMMARY,
+    PYTHON_SM_FIXTURE_CHECKSUMS,
+    PYTHON_SM_FIXTURE_RELEASES,
+    PYTHON_SM_PROJECT_SPECIFIER,
     PYTHON_WHEEL_FILENAME,
-    PYTHON_WHEEL_URL,
     PYTHON_WHEEL_SHA256,
+    PYTHON_WHEEL_URL,
     SHELF_PYTHON_JSON,
 )
-
 from pulp_python.tests.functional.utils import ensure_simple
 
-
 PYPI_LAST_SERIAL = "X-PYPI-LAST-SERIAL"
 PYPI_SERIAL_CONSTANT = 1000000000
 
@@ -225,26 +223,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.2}/pulp_python/tests/functional/api/test_rbac.py

@@ -1,6 +1,7 @@
-import pytest
 import uuid
 
+import pytest
+
 from pulp_python.tests.functional.constants import (
     PYTHON_EGG_FILENAME,
     PYTHON_EGG_SHA256,
@@ -44,9 +45,9 @@ def try_action(python_bindings, monitor_task):
         except python_bindings.module.ApiException as e:
             assert e.status == outcome, f"{e}"
         else:
-            assert (
-                status_code == outcome
-            ), f"User performed {action} when they shouldn't been able to"
+            assert status_code == outcome, (
+                f"User performed {action} when they shouldn't been able to"
+            )
             return data
 
     return _try_action

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_repair.py

@@ -1,7 +1,8 @@
-import pytest
 import subprocess
 from urllib.parse import urljoin
 
+import pytest
+
 from pulp_python.tests.functional.constants import (
     PYTHON_EGG_FILENAME,
     PYTHON_FIXTURES_URL,

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_upload.py

@@ -1,4 +1,5 @@
 import pytest
+
 from pulp_python.tests.functional.constants import (
     PYTHON_EGG_FILENAME,
     PYTHON_EGG_URL,

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/constants.py

@@ -1,7 +1,6 @@
 import os
 from urllib.parse import urljoin
 
-
 PULP_FIXTURES_BASE_URL = os.environ.get(
     "REMOTE_FIXTURES_ORIGIN", "https://fixtures.pulpproject.org/"
 )
@@ -112,19 +111,22 @@ PYTHON_LG_PROJECT_SPECIFIER = [
     "aiohttp",  # matches 7
     "bcrypt",  # matches 8
     "celery",  # matches 13
+    "crane",  # matches 0
     "Django",  # matches 31
+    "pulp-2to3-migration",  # matches 2
     "pytz",  # matches 6
     "scipy",  # matches 23
     "setuptools",  # matches 2
     "shelf-reader",  # matches 2
+    "twine",  # matches 14
 ]
-PYTHON_LG_PACKAGE_COUNT = 92
+PYTHON_LG_PACKAGE_COUNT = 108
 PYTHON_LG_FIXTURE_SUMMARY = {PYTHON_CONTENT_NAME: PYTHON_LG_PACKAGE_COUNT}
 PYTHON_LG_FIXTURE_COUNTS = {
-    "latest_3": 51,
-    "sdist": 28,
-    "bdist_wheel": 64,
-    "multi": 34,  # keep_latest=1, package_types="bdist_wheel", prereleases=False
+    "latest_3": 59,
+    "sdist": 36,
+    "bdist_wheel": 72,
+    "multi": 36,  # keep_latest=1, package_types="bdist_wheel", prereleases=False
 }
 
 DJANGO_LATEST_3 = 4  # latest version has 2 dists, each other has 1

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.19.0
+Version: 3.19.2
 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.81.0
+Requires-Dist: pulpcore<3.100,>=3.85.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.19.0 → pulp_python-3.19.2}/pulp_python.egg-info/requires.txt

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

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

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-python"
-version = "3.19.0"
+version = "3.19.2"
 description = "pulp-python plugin for the Pulp Project"
 readme = "README.md"
 authors = [
@@ -26,7 +26,7 @@ classifiers=[
 ]
 requires-python = ">=3.11"
 dependencies = [
-  "pulpcore>=3.81.0,<3.100",
+  "pulpcore>=3.85.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",
@@ -71,12 +71,14 @@ ignore = [
     ".github/**",
     "lint_requirements.txt",
     ".flake8",
+    "AGENTS.md",
+    "CLAUDE.md",
 ]
 
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.19.0"
+current_version = "3.19.2"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
@@ -121,5 +123,33 @@ replace = "version = \"{new_version}\""
 filename = "./pyproject.toml"
 search = "version = \"{current_version}\""
 replace = "version = \"{new_version}\""
+
+
 [tool.black]
 line-length = 100
+
+[tool.ruff]
+# This section is managed by the plugin template. Do not edit manually.
+line-length = 100
+extend-exclude = [
+  "docs/**",
+  "**/migrations/*.py",
+]
+
+[tool.ruff.lint]
+# This section is managed by the plugin template. Do not edit manually.
+extend-select = [
+  "I",
+  "INT",
+  "TID",
+  "T10",
+]
+
+[tool.ruff.lint.flake8-tidy-imports.banned-api]
+# This section is managed by the plugin template. Do not edit manually.
+"pulpcore.app".msg = "The 'pulpcore' apis must only be consumed via 'pulpcore.plugin'."
+
+[tool.ruff.lint.isort]
+# This section is managed by the plugin template. Do not edit manually.
+sections = { second-party = ["pulpcore"] }
+section-order = ["future", "standard-library", "third-party", "second-party", "first-party", "local-folder"]

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_download_content.py

@@ -1,10 +1,10 @@
 import pytest
 
 from pulp_python.tests.functional.constants import (
-    PYTHON_MD_PROJECT_SPECIFIER,
+    PYTHON_LG_PACKAGE_COUNT,
     PYTHON_LG_PROJECT_SPECIFIER,
     PYTHON_MD_PACKAGE_COUNT,
-    PYTHON_LG_PACKAGE_COUNT,
+    PYTHON_MD_PROJECT_SPECIFIER,
 )
 
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_full_mirror.py

@@ -1,19 +1,19 @@
+import subprocess
+from random import sample
+from urllib.parse import urljoin, urlsplit
+
 import pytest
 import requests
-import subprocess
+from packaging.version import parse
+from pypi_simple import ProjectPage
 
 from pulp_python.tests.functional.constants import (
     PYPI_URL,
-    PYTHON_XS_FIXTURE_CHECKSUMS,
-    PYTHON_SM_PROJECT_SPECIFIER,
     PYTHON_SM_FIXTURE_RELEASES,
+    PYTHON_SM_PROJECT_SPECIFIER,
+    PYTHON_XS_FIXTURE_CHECKSUMS,
 )
 
-from pypi_simple import ProjectPage
-from packaging.version import parse
-from urllib.parse import urljoin, urlsplit
-from random import sample
-
 
 def test_pull_through_install(
     python_bindings, python_remote_factory, python_distribution_factory, delete_orphans_pre

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/api/test_sync.py

@@ -1,21 +1,21 @@
 import pytest
 
 from pulp_python.tests.functional.constants import (
-    PYTHON_XS_PACKAGE_COUNT,
-    PYTHON_PRERELEASE_TEST_SPECIFIER,
-    PYTHON_WITH_PRERELEASE_COUNT,
-    PYTHON_WITHOUT_PRERELEASE_COUNT,
-    PYTHON_XS_PROJECT_SPECIFIER,
-    PYTHON_MD_PROJECT_SPECIFIER,
+    DJANGO_LATEST_3,
+    PYTHON_LG_FIXTURE_COUNTS,
+    PYTHON_LG_PACKAGE_COUNT,
+    PYTHON_LG_PROJECT_SPECIFIER,
     PYTHON_MD_PACKAGE_COUNT,
-    PYTHON_SM_PROJECT_SPECIFIER,
+    PYTHON_MD_PROJECT_SPECIFIER,
+    PYTHON_PRERELEASE_TEST_SPECIFIER,
     PYTHON_SM_PACKAGE_COUNT,
+    PYTHON_SM_PROJECT_SPECIFIER,
     PYTHON_UNAVAILABLE_PACKAGE_COUNT,
     PYTHON_UNAVAILABLE_PROJECT_SPECIFIER,
-    PYTHON_LG_PROJECT_SPECIFIER,
-    PYTHON_LG_PACKAGE_COUNT,
-    PYTHON_LG_FIXTURE_COUNTS,
-    DJANGO_LATEST_3,
+    PYTHON_WITH_PRERELEASE_COUNT,
+    PYTHON_WITHOUT_PRERELEASE_COUNT,
+    PYTHON_XS_PACKAGE_COUNT,
+    PYTHON_XS_PROJECT_SPECIFIER,
     SCIPY_COUNTS,
 )
 

{pulp_python-3.19.0 → pulp_python-3.19.2}/pulp_python/tests/functional/utils.py

@@ -1,6 +1,6 @@
-import requests
-
 from urllib.parse import urljoin
+
+import requests
 from lxml import html