pulp-python 3.10.0__tar.gz → 3.10.1__tar.gz

{pulp-python-3.10.0 → pulp_python-3.10.1}/CHANGES.rst

@@ -13,6 +13,23 @@ Changelog
 
 .. towncrier release notes start
 
+3.10.1 (2025-07-23)
+
+#### Bugfixes {: #3.10.1-bugfix }
+
+- Fixed tls_validation not being disabled when set to false on the remote.
+  `#653 <https://github.com/pulp/pulp_python/issues/653>`__
+- Fixed uploads not supporting packages using metadata spec 2.3
+  `#682 <https://github.com/pulp/pulp_python/issues/682>`__
+- Fixed the `package_types` filter breaking other remote filters.
+  `#691 <https://github.com/pulp/pulp_python/issues/691>`__
+- Fixed package name normalization issue preventing syncing packages with "." or "_" in their names.
+  `#716 <https://github.com/pulp/pulp_python/issues/716>`__
+- Fixed the JSONField specification so it doesn't break ruby bindings.
+  See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
+
+---
+
 3.10.0 (2023-05-17)
 ===================
 

{pulp-python-3.10.0 → pulp_python-3.10.1}/MANIFEST.in

@@ -8,3 +8,4 @@ include functest_requirements.txt
 include test_requirements.txt
 include unittest_requirements.txt
 include pulp_python/app/webserver_snippets/*
+exclude releasing.md

pulp_python-3.10.1/PKG-INFO

@@ -0,0 +1,44 @@
+Metadata-Version: 2.4
+Name: pulp-python
+Version: 3.10.1
+Summary: pulp-python plugin for the Pulp Project
+Home-page: https://www.pulpproject.org
+Author: Pulp Project Developers
+Author-email: pulp-list@redhat.com
+License: GPLv2+
+Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Framework :: Django
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pulpcore<3.40,>=3.28.0
+Requires-Dist: pkginfo<1.12.0,>=1.10.0
+Requires-Dist: bandersnatch<6.2,>=6.1
+Requires-Dist: pypi-simple<1.0.0,>=0.9.0
+Requires-Dist: azure-storage-blob<12.26.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# pulp_python
+
+![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
+
+A Pulp plugin to support hosting your own pip compatible Python packages.
+
+For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
+[Pulp project page](https://pulpproject.org).

{pulp-python-3.10.0 → pulp_python-3.10.1}/functest_requirements.txt

@@ -1,7 +1,9 @@
 git+https://github.com/pulp/pulp-smash.git#egg=pulp-smash
-pytest
+pytest<9
+pytest-custom_exit_code
+pytest-xdist
 lxml
 twine
 pypi-simple
-pulpcore-client
-pulp-python-client
+trustme~=1.2.0
+pytest-timeout

{pulp-python-3.10.0 → pulp_python-3.10.1}/pulp_python/app/__init__.py

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

pulp_python-3.10.1/pulp_python/app/fields.py

@@ -0,0 +1,12 @@
+from drf_spectacular.utils import extend_schema_field
+from drf_spectacular.types import OpenApiTypes
+from rest_framework import serializers
+
+
+@extend_schema_field(OpenApiTypes.OBJECT)
+class JSONObjectField(serializers.JSONField):
+    """A drf JSONField override to force openapi schema to use 'object' type.
+
+    Not strictly correct, but we relied on that for a long time.
+    See: https://github.com/tfranzel/drf-spectacular/issues/1095
+    """

{pulp-python-3.10.0 → pulp_python-3.10.1}/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.10.0 → pulp_python-3.10.1}/pulp_python/app/pypi/serializers.py

@@ -3,6 +3,7 @@ from gettext import gettext as _
 
 from rest_framework import serializers
 from pulp_python.app.utils import DIST_EXTENSIONS
+from pulp_python.app import fields
 from pulpcore.plugin.models import Artifact
 from django.db.utils import IntegrityError
 
@@ -27,9 +28,9 @@ class PackageMetadataSerializer(serializers.Serializer):
     """
 
     last_serial = serializers.IntegerField(help_text=_("Cache value from last PyPI sync"))
-    info = serializers.JSONField(help_text=_("Core metadata of the package"))
-    releases = serializers.JSONField(help_text=_("List of all the releases of the package"))
-    urls = serializers.JSONField()
+    info = fields.JSONObjectField(help_text=_("Core metadata of the package"))
+    releases = fields.JSONObjectField(help_text=_("List of all the releases of the package"))
+    urls = fields.JSONObjectField()
 
 
 class PackageUploadSerializer(serializers.Serializer):

{pulp-python-3.10.0 → pulp_python-3.10.1}/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.10.0 → pulp_python-3.10.1}/pulp_python/app/serializers.py

@@ -7,6 +7,7 @@ from pulpcore.plugin import models as core_models
 from pulpcore.plugin import serializers as core_serializers
 
 from pulp_python.app import models as python_models
+from pulp_python.app import fields
 from pulp_python.app.utils import get_project_metadata_from_artifact, parse_project_metadata
 
 
@@ -154,7 +155,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
         required=False, allow_blank=True,
         help_text=_('A browsable URL for the project and a label for it, separated by a comma.')
     )
-    project_urls = serializers.JSONField(
+    project_urls = fields.JSONObjectField(
         required=False, default=dict,
         help_text=_('A dictionary of labels and URLs for the project.')
     )
@@ -167,28 +168,28 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
         required=False, allow_blank=True,
         help_text=_('Field to specify the OS and CPU for which the binary package was compiled. ')
     )
-    requires_dist = serializers.JSONField(
+    requires_dist = fields.JSONObjectField(
         required=False, default=list,
         help_text=_('A JSON list containing names of some other distutils project '
                     'required by this distribution.')
     )
-    provides_dist = serializers.JSONField(
+    provides_dist = fields.JSONObjectField(
         required=False, default=list,
         help_text=_('A JSON list containing names of a Distutils project which is contained'
                     ' within this distribution.')
     )
-    obsoletes_dist = serializers.JSONField(
+    obsoletes_dist = fields.JSONObjectField(
         required=False, default=list,
         help_text=_('A JSON list containing names of a distutils project\'s distribution which '
                     'this distribution renders obsolete, meaning that the two projects should not '
                     'be installed at the same time.')
     )
-    requires_external = serializers.JSONField(
+    requires_external = fields.JSONObjectField(
         required=False, default=list,
         help_text=_('A JSON list containing some dependency in the system that the distribution '
                     'is to be used.')
     )
-    classifiers = serializers.JSONField(
+    classifiers = fields.JSONObjectField(
         required=False, default=list,
         help_text=_('A JSON list containing classification values for a Python package.')
     )

{pulp-python-3.10.0 → pulp_python-3.10.1}/pulp_python/app/tasks/sync.py

@@ -1,5 +1,7 @@
 import logging
+from typing import Optional, Any, AsyncGenerator
 
+import aiohttp
 from aiohttp import ClientResponseError, ClientError
 from lxml.etree import LxmlError
 from gettext import gettext as _
@@ -80,7 +82,7 @@ def create_bandersnatch_config(remote):
         config["plugins"]["enabled"] += "prerelease_release\n"
     if remote.package_types:
         rrfm = "regex_release_file_metadata"
-        config["plugins"]["enabled"] += rrfm
+        config["plugins"]["enabled"] += f"{rrfm}\n"
         if not config.has_section(rrfm):
             config.add_section(rrfm)
         config[rrfm]["any:release_file.packagetype"] = "\n".join(remote.package_types)
@@ -126,7 +128,7 @@ class PythonBanderStage(Stage):
         # Bandersnatch includes leading slash when forming API urls
         url = self.remote.url.rstrip("/")
         # local & global timeouts defaults to 10secs and 5 hours
-        async with Master(url) as master:
+        async with PulpMaster(url, tls=self.remote.tls_validation) as master:
             deferred_download = self.remote.policy != Remote.IMMEDIATE
             workers = self.remote.download_concurrency or self.remote.DEFAULT_DOWNLOAD_CONCURRENCY
             async with ProgressReport(
@@ -148,6 +150,25 @@ class PythonBanderStage(Stage):
                 await pmirror.synchronize(packages_to_sync)
 
 
+class PulpMaster(Master):
+    """
+    Pulp Master Class for Pulp specific overrides
+    """
+
+    def __init__(self, *args, tls=True, **kwargs):
+        self.tls = tls
+        super().__init__(*args, **kwargs)
+
+    async def get(
+        self, path: str, required_serial: Optional[int], **kw: Any
+    ) -> AsyncGenerator[aiohttp.ClientResponse, None]:
+        """Support tls=false"""
+        if not self.tls:
+            kw["ssl"] = False
+        async for r in super().get(path, required_serial, **kw):
+            yield r
+
+
 class PulpMirror(Mirror):
     """
     Pulp Mirror Class to perform syncing using Bandersnatch
@@ -257,4 +278,4 @@ class PulpMirror(Mirror):
         TODO
         This should have some error checking
         """
-        pass
+        logger.error("Sync encountered an error: ", exc_info=exception)

{pulp-python-3.10.0 → pulp_python-3.10.1}/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.10.0 → pulp_python-3.10.1}/pulp_python/tests/functional/api/test_download_content.py

@@ -14,6 +14,7 @@ from pulp_python.tests.functional.constants import (
     PYTHON_MD_PROJECT_SPECIFIER,
     PYTHON_MD_FIXTURE_SUMMARY,
     PYTHON_LG_FIXTURE_SUMMARY,
+    PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY,
     PYTHON_LG_PROJECT_SPECIFIER,
 )
 from pulp_python.tests.functional.utils import (
@@ -126,7 +127,9 @@ class PublishPyPIJSON(TestCaseUsingBindings, TestHelpersMixin):
         """
         remote = self._create_remote(includes=[], prereleases=True)
         repo = self._create_repo_and_sync_with_remote(remote)
-        self.assertEqual(get_content_summary(repo.to_dict()), PYTHON_LG_FIXTURE_SUMMARY)
+        self.assertEqual(
+            get_content_summary(repo.to_dict()), PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY
+        )
 
     def test_full_pulp_to_pulp_sync(self):
         """
@@ -149,3 +152,31 @@ 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)
+
+
+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.10.0 → pulp_python-3.10.1}/pulp_python/tests/functional/api/test_full_mirror.py

@@ -108,21 +108,26 @@ class PullThroughMirror(TestCaseUsingBindings, TestHelpersMixin):
         remote = self._create_remote(url=PYPI_URL)
         distro = self._create_distribution(remote=remote.pulp_href)
 
-        if self.cli_client.run(("pip", "list")).stdout.find("numpy") == -1:
-            content = self.content_api.list(name="numpy")
-            self.assertEqual(content.count, 0, msg="numpy content already present in test")
+        PACKAGE = "sampleproject"
+        if self.cli_client.run(("pip", "list")).stdout.find(PACKAGE) == -1:
+            content = self.content_api.list(name=PACKAGE)
+            self.assertEqual(
+                content.count, 0, msg=f"{PACKAGE} content already present in test"
+            )
             host = urlsplit(PULP_CONTENT_BASE_URL).hostname
             url = urljoin(self.PYPI_HOST, f"{distro.base_path}/simple/")
             out = self.cli_client.run(
-                ("pip", "install", "--trusted-host", host, "-i", url, "numpy")
+                ("pip", "install", "--trusted-host", host, "-i", url, PACKAGE)
             )
             self.addCleanup(delete_orphans)
-            self.assertTrue(self.cli_client.run(("pip", "list")).stdout.find("numpy") != -1, out)
-            self.addCleanup(self.cli_client.run, ("pip", "uninstall", "numpy", "-y"))
-            content = self.content_api.list(name="numpy")
+            self.assertTrue(
+                self.cli_client.run(("pip", "list")).stdout.find(PACKAGE) != -1, out
+            )
+            self.addCleanup(self.cli_client.run, ("pip", "uninstall", PACKAGE, "-y"))
+            content = self.content_api.list(name=PACKAGE)
             self.assertEqual(content.count, 1)
         else:
-            self.skipTest("Uninstall numpy before running this test")
+            self.skipTest(f"Uninstall {PACKAGE} before running this test")
 
     def test_pull_through_simple(self):
         """Tests that the simple page is properly modified when requesting a pull-through."""

{pulp-python-3.10.0 → pulp_python-3.10.1}/pulp_python/tests/functional/api/test_sync.py

@@ -641,6 +641,23 @@ class PlatformExcludeTestCase(unittest.TestCase):
         )
 
 
+@pytest.mark.parallel
+def test_sync_multiple_filters(
+    python_repo_with_sync, python_remote_factory, python_content_summary
+):
+    """Tests sync with multiple filters."""
+    remote = python_remote_factory(
+        includes=PYTHON_LG_PROJECT_SPECIFIER,
+        package_types=["bdist_wheel"],
+        keep_latest_packages=1,
+        prereleases=False
+    )
+    repo = python_repo_with_sync(remote)
+
+    summary = python_content_summary(repository_version=repo.latest_version_href)
+    assert summary.present["python.python"]["count"] == PYTHON_LG_FIXTURE_COUNTS["multi"]
+
+
 @pytest.mark.parallel
 def test_proxy_sync(
     python_repo,

pulp_python-3.10.1/pulp_python/tests/functional/conftest.py

@@ -0,0 +1,185 @@
+import pytest
+import uuid
+
+from pulp_smash.pulp3.utils import gen_distribution, gen_repo
+from pulp_python.tests.functional.constants import PYTHON_EGG_FILENAME, PYTHON_URL
+from pulp_python.tests.functional.utils import gen_python_remote
+
+from pulpcore.client.pulp_python import (
+    ApiClient,
+    ContentPackagesApi,
+    DistributionsPypiApi,
+    PublicationsPypiApi,
+    RepositoriesPythonApi,
+    RepositoriesPythonVersionsApi,
+    RemotesPythonApi,
+)
+
+
+# Bindings API Fixtures
+
+@pytest.fixture
+def python_bindings_client(cid, bindings_cfg):
+    """Provides the python bindings client object."""
+    api_client = ApiClient(bindings_cfg)
+    api_client.default_headers["Correlation-ID"] = cid
+    return api_client
+
+
+@pytest.fixture
+def python_repo_api_client(python_bindings_client):
+    """Provides the Python Repository API client object."""
+    return RepositoriesPythonApi(python_bindings_client)
+
+
+@pytest.fixture
+def python_repo_version_api_client(python_bindings_client):
+    """Provides the Python Repository Version API client object."""
+    return RepositoriesPythonVersionsApi(python_bindings_client)
+
+
+@pytest.fixture
+def python_distro_api_client(python_bindings_client):
+    """Provides the Python Distribution API client object."""
+    return DistributionsPypiApi(python_bindings_client)
+
+
+@pytest.fixture
+def python_content_api_client(python_bindings_client):
+    """Provides the Python Package Content API client object."""
+    return ContentPackagesApi(python_bindings_client)
+
+
+@pytest.fixture
+def python_remote_api_client(python_bindings_client):
+    """Provides the Python Remotes API client object."""
+    return RemotesPythonApi(python_bindings_client)
+
+
+@pytest.fixture
+def python_publication_api_client(python_bindings_client):
+    """Proves the Python Publication API client object."""
+    return PublicationsPypiApi(python_bindings_client)
+
+
+# Object Generation Fixtures
+
+@pytest.fixture
+def python_repo_factory(python_repo_api_client, gen_object_with_cleanup):
+    """A factory to generate a Python Repository with auto-cleanup."""
+    def _gen_python_repo(**kwargs):
+        kwargs.setdefault("name", str(uuid.uuid4()))
+        return gen_object_with_cleanup(python_repo_api_client, kwargs)
+
+    return _gen_python_repo
+
+
+@pytest.fixture
+def python_repo(python_repo_api_client, gen_object_with_cleanup):
+    """Creates a Python Repository and deletes it at test cleanup time."""
+    return gen_object_with_cleanup(python_repo_api_client, gen_repo())
+
+
+@pytest.fixture
+def python_distribution_factory(python_distro_api_client, gen_object_with_cleanup):
+    """A factory to generate a Python Distribution with auto-cleanup."""
+    def _gen_python_distribution(**kwargs):
+        distro_data = gen_distribution(**kwargs)
+        return gen_object_with_cleanup(python_distro_api_client, distro_data)
+
+    yield _gen_python_distribution
+
+
+@pytest.fixture
+def python_publication_factory(python_publication_api_client, gen_object_with_cleanup):
+    """A factory to generate a Python Publication with auto-cleanup."""
+    def _gen_python_publication(repository, version=None):
+        if version:
+            body = {"repository_version": f"{repository.versions_href}{version}/"}
+        else:
+            body = {"repository": repository.pulp_href}
+        return gen_object_with_cleanup(python_publication_api_client, body)
+
+    yield _gen_python_publication
+
+
+@pytest.fixture
+def python_remote_factory(python_remote_api_client, gen_object_with_cleanup):
+    """A factory to generate a Python Remote with auto-cleanup."""
+    def _gen_python_remote(**kwargs):
+        body = gen_python_remote(**kwargs)
+        return gen_object_with_cleanup(python_remote_api_client, body)
+
+    yield _gen_python_remote
+
+
+@pytest.fixture
+def python_repo_with_sync(
+    python_repo_api_client, python_repo_factory, python_remote_factory, monitor_task
+):
+    """A factory to generate a Python Repository synced with the passed in Remote."""
+    def _gen_python_repo_sync(remote=None, mirror=False, repository=None, **body):
+        kwargs = {}
+        if pulp_domain := body.get("pulp_domain"):
+            kwargs["pulp_domain"] = pulp_domain
+        remote = remote or python_remote_factory(**kwargs)
+        repo = repository or python_repo_factory(**body)
+        sync_body = {"mirror": mirror, "remote": remote.pulp_href}
+        monitor_task(python_repo_api_client.sync(repo.pulp_href, sync_body).task)
+        return python_repo_api_client.read(repo.pulp_href)
+
+    yield _gen_python_repo_sync
+
+
+@pytest.fixture
+def download_python_file(tmp_path, http_get):
+    """Download a Python file and return its path."""
+    def _download_python_file(relative_path, url):
+        file_path = tmp_path / relative_path
+        with open(file_path, mode="wb") as f:
+            f.write(http_get(url))
+        return file_path
+
+    yield _download_python_file
+
+
+@pytest.fixture
+def python_content_factory(python_content_api_client, download_python_file, monitor_task):
+    """A factory to create a Python Package Content."""
+    def _gen_python_content(relative_path=PYTHON_EGG_FILENAME, url=None, **body):
+        body["relative_path"] = relative_path
+        if url:
+            body["file"] = download_python_file(relative_path, url)
+        elif not any(x in body for x in ("artifact", "file", "upload")):
+            body["file"] = download_python_file(PYTHON_EGG_FILENAME, PYTHON_URL)
+        if repo := body.get("repository"):
+            repo_href = repo if isinstance(repo, str) else repo.pulp_href
+            body["repository"] = repo_href
+
+        task = python_content_api_client.create(**body).task
+        response = monitor_task(task)
+        return python_content_api_client.read(response.created_resources[0])
+
+    yield _gen_python_content
+
+
+@pytest.fixture
+def python_content_summary(python_repo_api_client, python_repo_version_api_client):
+    """Get a summary of the repository version's content."""
+    def _gen_summary(repository_version=None, repository=None, version=None):
+        if repository_version is None:
+            repo_href = get_href(repository)
+            if version:
+                repo_ver_href = f"{repo_href}versions/{version}/"
+            else:
+                repo_ver_href = python_repo_api_client.read(repo_href).latest_version_href
+        else:
+            repo_ver_href = get_href(repository_version)
+        return python_repo_version_api_client.read(repo_ver_href).content_summary
+
+    yield _gen_summary
+
+
+def get_href(item):
+    """Tries to get the href from the given item, whether it is a string or object."""
+    return item if isinstance(item, str) else item.pulp_href

{pulp-python-3.10.0 → pulp_python-3.10.1}/pulp_python/tests/functional/constants.py

@@ -145,14 +145,17 @@ PYTHON_LG_PROJECT_SPECIFIER = [
     "celery",  # matches 13
     "Django",  # matches 31
     "scipy",  # matches 23
+    "setuptools",  # matches 2
     "shelf-reader",  # matches 2
 ]
-PYTHON_LG_PACKAGE_COUNT = 76
+PYTHON_LG_PACKAGE_COUNT = 78
 PYTHON_LG_FIXTURE_SUMMARY = {PYTHON_CONTENT_NAME: PYTHON_LG_PACKAGE_COUNT}
+PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY = {PYTHON_CONTENT_NAME: 92}
 PYTHON_LG_FIXTURE_COUNTS = {
-    "latest_3": 35,
-    "sdist": 23,
-    "bdist_wheel": 53,
+    "latest_3": 37,
+    "sdist": 24,
+    "bdist_wheel": 54,
+    "multi": 26,  # 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.10.1/pulp_python.egg-info/PKG-INFO

@@ -0,0 +1,44 @@
+Metadata-Version: 2.4
+Name: pulp-python
+Version: 3.10.1
+Summary: pulp-python plugin for the Pulp Project
+Home-page: https://www.pulpproject.org
+Author: Pulp Project Developers
+Author-email: pulp-list@redhat.com
+License: GPLv2+
+Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Framework :: Django
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pulpcore<3.40,>=3.28.0
+Requires-Dist: pkginfo<1.12.0,>=1.10.0
+Requires-Dist: bandersnatch<6.2,>=6.1
+Requires-Dist: pypi-simple<1.0.0,>=0.9.0
+Requires-Dist: azure-storage-blob<12.26.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# pulp_python
+
+![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
+
+A Pulp plugin to support hosting your own pip compatible Python packages.
+
+For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
+[Pulp project page](https://pulpproject.org).

{pulp-python-3.10.0 → pulp_python-3.10.1}/pulp_python.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ pulp_python.egg-info/entry_points.txt
 pulp_python.egg-info/requires.txt
 pulp_python.egg-info/top_level.txt
 pulp_python/app/__init__.py
+pulp_python/app/fields.py
 pulp_python/app/models.py
 pulp_python/app/serializers.py
 pulp_python/app/settings.py

{pulp-python-3.10.0 → pulp_python-3.10.1}/pulp_python.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [pulpcore.plugin]
 pulp_python = pulp_python:default_app_config
-

pulp_python-3.10.1/pulp_python.egg-info/requires.txt

@@ -0,0 +1,5 @@
+pulpcore<3.40,>=3.28.0
+pkginfo<1.12.0,>=1.10.0
+bandersnatch<6.2,>=6.1
+pypi-simple<1.0.0,>=0.9.0
+azure-storage-blob<12.26.0

pulp_python-3.10.1/pyproject.toml

@@ -0,0 +1,72 @@
+[tool.towncrier]
+package = "pulp_python"
+filename = "CHANGES.rst"
+directory = "CHANGES/"
+title_format = "{version} ({project_date})"
+template = "CHANGES/.TEMPLATE.md"
+issue_format = "`#{issue} <https://github.com/pulp/pulp_python/issues/{issue}>`__"
+
+[tool.check-manifest]
+ignore = [
+    ".bumpversion.cfg",
+    ".pep8speaks.yml",
+    "CHANGES/**",
+    "CONTRIBUTING.rst",
+    "HISTORY.rst",
+    "dev_requirements.txt",
+    "doc_requirements.txt",
+    "docs/**",
+    "template_config.yml",
+    ".travis/**",
+    ".travis.yml",
+    "shelf_reader-0.1-py2-none-any.whl",
+    ".github/**",
+    ".ci/**",
+    "lint_requirements.txt",
+    ".flake8",
+]
+
+[tool.bumpversion]
+# This section is managed by the plugin template. Do not edit manually.
+
+current_version = "3.10.1"
+commit = false
+tag = false
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
+serialize = [
+  "{major}.{minor}.{patch}.{release}",
+  "{major}.{minor}.{patch}",
+  "{major}.{minor}.{alpha}{patch}.{release}",
+  "{major}.{minor}.{alpha}{patch}",
+]
+
+[tool.bumpversion.parts.alpha]
+# This section is managed by the plugin template. Do not edit manually.
+
+# This is sort of a hack. In PEP440 prerelease markers work quite differently.
+# But this fits best with the way we have been doing release versions.
+optional_value = "final"
+values = [
+  "0a",
+  "final",
+]
+independent = true
+
+[tool.bumpversion.parts.release]
+# This section is managed by the plugin template. Do not edit manually.
+
+optional_value = "prod"
+values = [
+  "dev",
+  "prod",
+]
+
+[[tool.bumpversion.files]]
+# This section is managed by the plugin template. Do not edit manually.
+
+filename = "./pulp_python/app/__init__.py"
+search = "version = \"{current_version}\""
+replace = "version = \"{new_version}\""
+
+[[tool.bumpversion.files]]
+filename = "./setup.py"

pulp_python-3.10.1/requirements.txt

@@ -0,0 +1,6 @@
+pulpcore>=3.28.0,<3.40
+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
+# pinned until https://github.com/Azure/Azurite/issues/2562 is resolved
+azure-storage-blob<12.26.0

{pulp-python-3.10.0 → pulp_python-3.10.1}/setup.py

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

pulp_python-3.10.1/test_requirements.txt

@@ -0,0 +1,3 @@
+# All test requirements
+-r functest_requirements.txt
+-r unittest_requirements.txt

pulp-python-3.10.0/PKG-INFO

@@ -1,28 +0,0 @@
-Metadata-Version: 2.1
-Name: pulp-python
-Version: 3.10.0
-Summary: pulp-python plugin for the Pulp Project
-Home-page: https://www.pulpproject.org
-Author: Pulp Project Developers
-Author-email: pulp-list@redhat.com
-License: GPLv2+
-Description: # pulp_python
-        
-        ![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
-        
-        A Pulp plugin to support hosting your own pip compatible Python packages.
-        
-        For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
-        [Pulp project page](https://pulpproject.org).
-        
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Framework :: Django
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown

pulp-python-3.10.0/pulp_python/tests/functional/conftest.py

@@ -1,94 +0,0 @@
-import pytest
-
-from pulp_smash.pulp3.utils import gen_distribution, gen_repo
-from pulp_python.tests.functional.utils import gen_python_remote
-
-from pulpcore.client.pulp_python import (
-    ApiClient,
-    ContentPackagesApi,
-    DistributionsPypiApi,
-    PublicationsPypiApi,
-    RepositoriesPythonApi,
-    RemotesPythonApi,
-)
-
-
-# Bindings API Fixtures
-
-@pytest.fixture
-def python_bindings_client(cid, bindings_cfg):
-    """Provides the python bindings client object."""
-    api_client = ApiClient(bindings_cfg)
-    api_client.default_headers["Correlation-ID"] = cid
-    return api_client
-
-
-@pytest.fixture
-def python_repo_api_client(python_bindings_client):
-    """Provides the Python Repository API client object."""
-    return RepositoriesPythonApi(python_bindings_client)
-
-
-@pytest.fixture
-def python_distro_api_client(python_bindings_client):
-    """Provides the Python Distribution API client object."""
-    return DistributionsPypiApi(python_bindings_client)
-
-
-@pytest.fixture
-def python_content_api_client(python_bindings_client):
-    """Provides the Python Package Content API client object."""
-    return ContentPackagesApi(python_bindings_client)
-
-
-@pytest.fixture
-def python_remote_api_client(python_bindings_client):
-    """Provides the Python Remotes API client object."""
-    return RemotesPythonApi(python_bindings_client)
-
-
-@pytest.fixture
-def python_publication_api_client(python_bindings_client):
-    """Proves the Python Publication API client object."""
-    return PublicationsPypiApi(python_bindings_client)
-
-
-# Object Generation Fixtures
-
-@pytest.fixture
-def python_repo(python_repo_api_client, gen_object_with_cleanup):
-    """Creates a Python Repository and deletes it at test cleanup time."""
-    return gen_object_with_cleanup(python_repo_api_client, gen_repo())
-
-
-@pytest.fixture
-def python_distribution_factory(python_distro_api_client, gen_object_with_cleanup):
-    """A factory to generate a Python Distribution with auto-cleanup."""
-    def _gen_python_distribution(**kwargs):
-        distro_data = gen_distribution(**kwargs)
-        return gen_object_with_cleanup(python_distro_api_client, distro_data)
-
-    yield _gen_python_distribution
-
-
-@pytest.fixture
-def python_publication_factory(python_publication_api_client, gen_object_with_cleanup):
-    """A factory to generate a Python Publication with auto-cleanup."""
-    def _gen_python_publication(repository, version=None):
-        if version:
-            body = {"repository_version": f"{repository.versions_href}{version}/"}
-        else:
-            body = {"repository": repository.pulp_href}
-        return gen_object_with_cleanup(python_publication_api_client, body)
-
-    yield _gen_python_publication
-
-
-@pytest.fixture
-def python_remote_factory(python_remote_api_client, gen_object_with_cleanup):
-    """A factory to generate a Python Remote with auto-cleanup."""
-    def _gen_python_remote(**kwargs):
-        body = gen_python_remote(**kwargs)
-        return gen_object_with_cleanup(python_remote_api_client, body)
-
-    yield _gen_python_remote

pulp-python-3.10.0/pulp_python.egg-info/PKG-INFO

@@ -1,28 +0,0 @@
-Metadata-Version: 2.1
-Name: pulp-python
-Version: 3.10.0
-Summary: pulp-python plugin for the Pulp Project
-Home-page: https://www.pulpproject.org
-Author: Pulp Project Developers
-Author-email: pulp-list@redhat.com
-License: GPLv2+
-Description: # pulp_python
-        
-        ![Pulp Nightly CI/CD](https://github.com/pulp/pulp_python/actions/workflows/nightly.yml/badge.svg)
-        
-        A Pulp plugin to support hosting your own pip compatible Python packages.
-        
-        For more information, please see the [documentation](https://docs.pulpproject.org/pulp_python/) or the
-        [Pulp project page](https://pulpproject.org).
-        
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Framework :: Django
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown

pulp-python-3.10.0/pulp_python.egg-info/requires.txt

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

pulp-python-3.10.0/pyproject.toml

@@ -1,27 +0,0 @@
-[tool.towncrier]
-package = "pulp_python"
-filename = "CHANGES.rst"
-directory = "CHANGES/"
-title_format = "{version} ({project_date})"
-template = "CHANGES/.TEMPLATE.rst"
-issue_format = "`#{issue} <https://github.com/pulp/pulp_python/issues/{issue}>`__"
-
-[tool.check-manifest]
-ignore = [
-    ".bumpversion.cfg",
-    ".pep8speaks.yml",
-    "CHANGES/**",
-    "CONTRIBUTING.rst",
-    "HISTORY.rst",
-    "dev_requirements.txt",
-    "doc_requirements.txt",
-    "docs/**",
-    "template_config.yml",
-    ".travis/**",
-    ".travis.yml",
-    "shelf_reader-0.1-py2-none-any.whl",
-    ".github/**",
-    ".ci/**",
-    "lint_requirements.txt",
-    ".flake8",
-]

pulp-python-3.10.0/requirements.txt

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

pulp-python-3.10.0/test_requirements.txt

@@ -1,10 +0,0 @@
-coveralls
-coverage
-flake8
-flake8-docstrings
-flake8-tuple
-flake8-quotes
-mock
-git+https://github.com/pulp/pulp-smash.git#egg=pulp-smash
-pydocstyle<4
-pytest