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

{pulp-python-3.10.0 → pulp-python-3.11.1}/CHANGES.rst

@@ -13,6 +13,34 @@ Changelog
 
 .. towncrier release notes start
 
+3.11.1 (2024-04-11)
+===================
+
+Bugfixes
+--------
+
+- Fixed tls_validation not being disabled when set to false on the remote.
+  `#653 <https://github.com/pulp/pulp_python/issues/653>`__
+
+
+----
+
+
+3.11.0 (2023-11-08)
+===================
+
+
+Features
+--------
+
+- Added pulpcore 3.40 compatibility.
+- Added import export support of python content.
+  `#579 <https://github.com/pulp/pulp_python/issues/579>`__
+
+
+----
+
+
 3.10.0 (2023-05-17)
 ===================
 

{pulp-python-3.10.0 → pulp-python-3.11.1}/PKG-INFO

@@ -1,21 +1,11 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.10.0
+Version: 3.11.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+
-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
@@ -26,3 +16,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# 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.11.1}/functest_requirements.txt

@@ -1,5 +1,5 @@
 git+https://github.com/pulp/pulp-smash.git#egg=pulp-smash
-pytest
+pytest<8
 lxml
 twine
 pypi-simple

{pulp-python-3.10.0 → pulp-python-3.11.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.11.1"
     python_package_name = "pulp-python"

pulp-python-3.11.1/pulp_python/app/modelresource.py

@@ -0,0 +1,40 @@
+from pulpcore.plugin.importexport import BaseContentResource
+from pulpcore.plugin.modelresources import RepositoryResource
+from pulp_python.app.models import (
+    PythonPackageContent,
+    PythonRepository,
+)
+
+
+class PythonPackageContentResource(BaseContentResource):
+    """
+    Resource for import/export of python_pythonpackagecontent entities.
+    """
+
+    def set_up_queryset(self):
+        """
+        :return: PythonPackageContent specific to a specified repo-version.
+        """
+        return PythonPackageContent.objects.filter(pk__in=self.repo_version.content)
+
+    class Meta:
+        model = PythonPackageContent
+        import_id_fields = model.natural_key_fields()
+
+
+class PythonRepositoryResource(RepositoryResource):
+    """
+    A resource for importing/exporting python repository entities
+    """
+
+    def set_up_queryset(self):
+        """
+        :return: A queryset containing one repository that will be exported.
+        """
+        return PythonRepository.objects.filter(pk=self.repo_version.repository)
+
+    class Meta:
+        model = PythonRepository
+
+
+IMPORT_ORDER = [PythonPackageContentResource, PythonRepositoryResource]

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

@@ -1,9 +1,12 @@
 import logging
+import tempfile
+from typing import Optional, Any, AsyncGenerator
 
+import aiohttp
 from aiohttp import ClientResponseError, ClientError
 from lxml.etree import LxmlError
 from gettext import gettext as _
-from os import environ, path
+from os import environ
 
 from rest_framework import serializers
 
@@ -111,9 +114,10 @@ class PythonBanderStage(Stage):
         """
         If includes is specified, then only sync those,else try to sync all other packages
         """
-        # Prevent bandersnatch from reading actual .netrc file, set to nonexistent file
+        # Prevent bandersnatch from reading actual .netrc file, set to empty file
         # See discussion on https://github.com/pulp/pulp_python/issues/581
-        environ["NETRC"] = f"{path.curdir}/.fake-netrc"
+        fake_netrc = tempfile.NamedTemporaryFile(dir=".", delete=False)
+        environ["NETRC"] = fake_netrc.name
         # TODO Change Bandersnatch internal API to take proxy settings in from config parameters
         if proxy_url := self.remote.proxy_url:
             if self.remote.proxy_username or self.remote.proxy_password:
@@ -126,7 +130,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 +152,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 +280,4 @@ class PulpMirror(Mirror):
         TODO
         This should have some error checking
         """
-        pass
+        logger.error("Sync encountered an error: ", exc_info=exception)

pulp-python-3.11.1/pulp_python/tests/functional/api/test_export_import.py

@@ -0,0 +1,108 @@
+"""
+Tests PulpExporter and PulpExport functionality.
+
+NOTE: assumes ALLOWED_EXPORT_PATHS setting contains "/tmp" - all tests will fail if this is not
+the case.
+"""
+import pytest
+import uuid
+
+from pulp_python.tests.functional.constants import (
+    PYTHON_XS_PROJECT_SPECIFIER, PYTHON_SM_PROJECT_SPECIFIER
+)
+
+
+@pytest.mark.parallel
+def test_export_then_import(
+    python_repo_factory,
+    python_remote_factory,
+    python_repo_api_client,
+    python_repo_version_api_client,
+    exporters_pulp_api_client,
+    exporters_pulp_exports_api_client,
+    importers_pulp_api_client,
+    importers_pulp_imports_api_client,
+    monitor_task,
+    monitor_task_group,
+    gen_object_with_cleanup,
+):
+    """Issue and evaluate a PulpExport (tests both Create and Read)."""
+    # Prepare content
+    remote_a = python_remote_factory(includes=PYTHON_XS_PROJECT_SPECIFIER, policy="immediate")
+    remote_b = python_remote_factory(includes=PYTHON_SM_PROJECT_SPECIFIER, policy="immediate")
+    repo_a = python_repo_factory()
+    repo_b = python_repo_factory()
+    sync_response_a = python_repo_api_client.sync(
+        repo_a.pulp_href, {"remote": remote_a.pulp_href}
+    )
+    sync_response_b = python_repo_api_client.sync(
+        repo_b.pulp_href, {"remote": remote_b.pulp_href}
+    )
+    monitor_task(sync_response_a.task)
+    monitor_task(sync_response_b.task)
+
+    repo_ver_a = python_repo_version_api_client.read(f"{repo_a.pulp_href}versions/1/")
+    repo_ver_b = python_repo_version_api_client.read(f"{repo_b.pulp_href}versions/1/")
+
+    # Prepare export
+    exporter = gen_object_with_cleanup(
+        exporters_pulp_api_client,
+        {
+            "name": str(uuid.uuid4()),
+            "path": f"/tmp/{uuid.uuid4()}/",
+            "repositories": [repo.pulp_href for repo in [repo_a, repo_b]],
+        },
+    )
+
+    # Export
+    task = exporters_pulp_exports_api_client.create(exporter.pulp_href, {}).task
+    task = monitor_task(task)
+    assert len(task.created_resources) == 1
+    export = exporters_pulp_exports_api_client.read(task.created_resources[0])
+    assert export is not None
+    assert len(exporter.repositories) == len(export.exported_resources)
+    assert export.output_file_info is not None
+    for an_export_filename in export.output_file_info.keys():
+        assert "//" not in an_export_filename
+    export_filename = next(
+        f for f in export.output_file_info.keys() if f.endswith("tar.gz") or f.endswith("tar")
+    )
+
+    # Prepare import
+    repo_c = python_repo_factory()
+    repo_d = python_repo_factory()
+    repo_mapping = {repo_a.name: repo_c.name, repo_b.name: repo_d.name}
+    importer = gen_object_with_cleanup(
+        importers_pulp_api_client, {"name": str(uuid.uuid4()), "repo_mapping": repo_mapping}
+    )
+
+    # Import
+    import_response = importers_pulp_imports_api_client.create(
+        importer.pulp_href, {"path": export_filename}
+    )
+    monitor_task_group(import_response.task_group)
+    repo_c = python_repo_api_client.read(repo_c.pulp_href)
+    repo_d = python_repo_api_client.read(repo_d.pulp_href)
+    assert repo_c.latest_version_href == f"{repo_c.pulp_href}versions/1/"
+    assert repo_d.latest_version_href == f"{repo_d.pulp_href}versions/1/"
+    repo_ver_c = python_repo_version_api_client.read(f"{repo_c.pulp_href}versions/1/")
+    repo_ver_d = python_repo_version_api_client.read(f"{repo_d.pulp_href}versions/1/")
+    assert (
+        repo_ver_c.content_summary.added["python.python"]["count"]
+        == repo_ver_a.content_summary.present["python.python"]["count"]
+    )
+    assert (
+        repo_ver_d.content_summary.added["python.python"]["count"]
+        == repo_ver_b.content_summary.present["python.python"]["count"]
+    )
+
+    # Import a second time
+    import_response = importers_pulp_imports_api_client.create(
+        importer.pulp_href, {"path": export_filename}
+    )
+    monitor_task_group(import_response.task_group)
+    assert len(importers_pulp_imports_api_client.list(importer.pulp_href).results) == 2
+    for repo in [repo_c, repo_d]:
+        repo = python_repo_api_client.read(repo.pulp_href)
+        # still only one version as pulp won't create a new version if nothing changed
+        assert repo.latest_version_href == f"{repo.pulp_href}versions/1/"

{pulp-python-3.10.0 → pulp-python-3.11.1}/pulp_python/tests/functional/api/test_full_mirror.py

@@ -108,21 +108,22 @@ 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 = "pulpcore-releases"
+        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.11.1}/pulp_python/tests/functional/conftest.py

@@ -1,6 +1,7 @@
 import pytest
+import uuid
 
-from pulp_smash.pulp3.utils import gen_distribution, gen_repo
+from pulp_smash.pulp3.utils import gen_distribution
 from pulp_python.tests.functional.utils import gen_python_remote
 
 from pulpcore.client.pulp_python import (
@@ -9,6 +10,7 @@ from pulpcore.client.pulp_python import (
     DistributionsPypiApi,
     PublicationsPypiApi,
     RepositoriesPythonApi,
+    RepositoriesPythonVersionsApi,
     RemotesPythonApi,
 )
 
@@ -29,6 +31,12 @@ def python_repo_api_client(python_bindings_client):
     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."""
@@ -56,9 +64,19 @@ def python_publication_api_client(python_bindings_client):
 # Object Generation Fixtures
 
 @pytest.fixture
-def python_repo(python_repo_api_client, gen_object_with_cleanup):
+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_factory):
     """Creates a Python Repository and deletes it at test cleanup time."""
-    return gen_object_with_cleanup(python_repo_api_client, gen_repo())
+    return python_repo_factory()
 
 
 @pytest.fixture

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

@@ -142,17 +142,19 @@ PYTHON_MD_PYPI_SUMMARY = {"projects": 4, "releases": 17, "files": 26}
 
 PYTHON_LG_PROJECT_SPECIFIER = [
     "aiohttp",  # matches 7
+    "bcrypt",  # matches 8
     "celery",  # matches 13
     "Django",  # matches 31
+    "pytz",  # matches 6
     "scipy",  # matches 23
     "shelf-reader",  # matches 2
 ]
-PYTHON_LG_PACKAGE_COUNT = 76
+PYTHON_LG_PACKAGE_COUNT = 90
 PYTHON_LG_FIXTURE_SUMMARY = {PYTHON_CONTENT_NAME: PYTHON_LG_PACKAGE_COUNT}
 PYTHON_LG_FIXTURE_COUNTS = {
-    "latest_3": 35,
-    "sdist": 23,
-    "bdist_wheel": 53,
+    "latest_3": 49,
+    "sdist": 27,
+    "bdist_wheel": 63,
 }
 
 DJANGO_LATEST_3 = 4  # latest version has 2 dists, each other has 1

{pulp-python-3.10.0 → pulp-python-3.11.1}/pulp_python.egg-info/PKG-INFO

@@ -1,21 +1,11 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.10.0
+Version: 3.11.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+
-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
@@ -26,3 +16,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# 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.11.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/modelresource.py
 pulp_python/app/models.py
 pulp_python/app/serializers.py
 pulp_python/app/settings.py
@@ -58,6 +59,7 @@ pulp_python/tests/functional/api/test_crud_content_unit.py
 pulp_python/tests/functional/api/test_crud_publications.py
 pulp_python/tests/functional/api/test_crud_remotes.py
 pulp_python/tests/functional/api/test_download_content.py
+pulp_python/tests/functional/api/test_export_import.py
 pulp_python/tests/functional/api/test_full_mirror.py
 pulp_python/tests/functional/api/test_pypi_apis.py
 pulp_python/tests/functional/api/test_sync.py

{pulp-python-3.10.0 → pulp-python-3.11.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.0 → pulp-python-3.11.1}/pulp_python.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pulpcore<3.40,>=3.25.0
+pulpcore<3.55,>=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 → pulp-python-3.11.1}/requirements.txt

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

{pulp-python-3.10.0 → pulp-python-3.11.1}/setup.py

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

pulp-python-3.11.1/unittest_requirements.txt

@@ -0,0 +1,2 @@
+mock
+pytest<8

pulp-python-3.10.0/unittest_requirements.txt

@@ -1,2 +0,0 @@
-mock
-pytest