pulp-python 3.12.3__tar.gz → 3.12.5__tar.gz

{pulp-python-3.12.3 → pulp-python-3.12.5}/CHANGES.md

@@ -8,6 +8,24 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.12.5 (2024-10-25) {: #3.12.5 }
+
+#### Bugfixes {: #3.12.5-bugfix }
+
+- Fixed the JSONField specification so it doesn't break ruby bindings.
+  See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
+
+---
+
+## 3.12.4 (2024-10-14) {: #3.12.4 }
+
+#### Bugfixes {: #3.12.4-bugfix }
+
+- Fixed replicate failing on upstream on-demand repositories
+  [#718](https://github.com/pulp/pulp_python/issues/718)
+
+---
+
 ## 3.12.3 (2024-08-26) {: #3.12.3 }
 
 #### Bugfixes {: #3.12.3-bugfix }

{pulp-python-3.12.3 → pulp-python-3.12.5}/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.12.3 → pulp-python-3.12.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.12.3
+Version: 3.12.5
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers

{pulp-python-3.12.3 → pulp-python-3.12.5}/functest_requirements.txt

@@ -6,3 +6,4 @@ pytest-custom_exit_code
 pytest-xdist
 proxy.py~=2.4.4
 trustme~=1.1.0
+pytest-timeout

{pulp-python-3.12.3 → pulp-python-3.12.5}/pulp_python/app/__init__.py

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

pulp-python-3.12.5/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.12.3 → pulp-python-3.12.5}/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 pulpcore.plugin.util import get_domain
 from django.db.utils import IntegrityError
@@ -28,9 +29,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.12.3 → pulp-python-3.12.5}/pulp_python/app/replica.py

@@ -28,6 +28,14 @@ class PythonReplicator(Replicator):
         # strain the upstream Pulp.
         return {"policy": "immediate", "prereleases": True}
 
+    def url(self, upstream_distribution):
+        # Ignore distributions that are only pull-through
+        repo, pub = upstream_distribution["repository"], upstream_distribution["publication"]
+        if repo or pub:
+            return super().url(upstream_distribution)
+
+        return None
+
     def repository_extra_fields(self, remote):
         # Use autopublish since publications result in faster serving times
         return {"autopublish": True}

{pulp-python-3.12.3 → pulp-python-3.12.5}/pulp_python/app/serializers.py

@@ -8,6 +8,7 @@ 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 import fields
 from pulp_python.app.utils import get_project_metadata_from_artifact, parse_project_metadata
 
 
@@ -157,7 +158,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.')
     )
@@ -170,28 +171,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.12.3 → pulp-python-3.12.5}/pulp_python/app/tasks/sync.py

@@ -256,8 +256,9 @@ class PulpMirror(Mirror):
             for package in dists:
                 entry = parse_metadata(pkg.info, version, package)
                 url = entry.pop("url")
+                size = package["size"] or None
 
-                artifact = Artifact(sha256=entry["sha256"])
+                artifact = Artifact(sha256=entry["sha256"], size=size)
                 package = PythonPackageContent(**entry)
 
                 da = DeclarativeArtifact(

{pulp-python-3.12.3 → pulp-python-3.12.5}/pulp_python/app/utils.py

@@ -284,19 +284,21 @@ def python_content_to_download_info(content, base_path, domain=None):
     if domain:
         components.insert(2, domain.name)
     url = "/".join(components)
+    md5 = artifact.md5 if artifact and artifact.md5 else ""
+    size = artifact.size if artifact and artifact.size else 0
     return {
         "comment_text": "",
-        "digests": {"md5": artifact.md5, "sha256": artifact.sha256},
+        "digests": {"md5": md5, "sha256": content.sha256},
         "downloads": -1,
         "filename": content.filename,
         "has_sig": False,
-        "md5_digest": artifact.md5,
+        "md5_digest": md5,
         "packagetype": content.packagetype,
         "python_version": content.python_version,
         "requires_python": content.requires_python or None,
-        "size": artifact.size,
-        "upload_time": str(artifact.pulp_created),
-        "upload_time_iso_8601": str(artifact.pulp_created.isoformat()),
+        "size": size,
+        "upload_time": str(content.pulp_created),
+        "upload_time_iso_8601": str(content.pulp_created.isoformat()),
         "url": url,
         "yanked": False,
         "yanked_reason": None

{pulp-python-3.12.3 → pulp-python-3.12.5}/pulp_python/tests/functional/api/test_domains.py

@@ -5,7 +5,12 @@ import subprocess
 
 from pulpcore.app import settings
 
-from pulp_python.tests.functional.constants import PYTHON_URL, PYTHON_EGG_FILENAME
+from pulp_python.tests.functional.constants import (
+    PYTHON_URL,
+    PYTHON_EGG_FILENAME,
+    PYTHON_SM_PROJECT_SPECIFIER,
+    PYTHON_SM_PACKAGE_COUNT,
+)
 from urllib.parse import urlsplit
 
 
@@ -144,7 +149,7 @@ def test_domain_content_replication(
     python_bindings,
     python_file,
     python_repo_factory,
-    python_publication_factory,
+    python_remote_factory,
     python_distribution_factory,
     monitor_task,
     monitor_task_group,
@@ -154,13 +159,12 @@ def test_domain_content_replication(
     """Test replication feature through the usage of domains."""
     # Set up source domain to replicate from
     source_domain = domain_factory()
-    repo = python_repo_factory(pulp_domain=source_domain.name)
+    repo = python_repo_factory(pulp_domain=source_domain.name, autopublish=True)
     body = {"relative_path": PYTHON_EGG_FILENAME, "file": python_file, "repository": repo.pulp_href}
     monitor_task(
         python_bindings.ContentPackagesApi.create(pulp_domain=source_domain.name, **body).task
     )
-    pub = python_publication_factory(repository=repo, pulp_domain=source_domain.name)
-    python_distribution_factory(publication=pub.pulp_href, pulp_domain=source_domain.name)
+    python_distribution_factory(repository=repo, pulp_domain=source_domain.name)
 
     # Create the replica domain
     replica_domain = domain_factory()
@@ -171,6 +175,7 @@ def test_domain_content_replication(
         "domain": source_domain.name,
         "username": bindings_cfg.username,
         "password": bindings_cfg.password,
+        "tls_validation": False,
     }
     upstream_pulp = gen_object_with_cleanup(
         pulpcore_bindings.UpstreamPulpsApi, upstream_pulp_body, pulp_domain=replica_domain.name
@@ -194,6 +199,25 @@ def test_domain_content_replication(
 
     assert all(1 == x for x in counts.values()), f"Replica had more than 1 object {counts}"
 
+    # Test that we can replicate from an Upstream on-demand source (syncs are on-demand by default)
+    remote = python_remote_factory(
+        includes=PYTHON_SM_PROJECT_SPECIFIER, pulp_domain=source_domain.name
+    )
+    body = {"remote": remote.pulp_href}
+    monitor_task(python_bindings.RepositoriesPythonApi.sync(repo.pulp_href, body).task)
+
+    response = pulpcore_bindings.UpstreamPulpsApi.replicate(upstream_pulp.pulp_href)
+    monitor_task_group(response.task_group)
+
+    response = python_bindings.ContentPackagesApi.list(pulp_domain=replica_domain.name)
+    assert PYTHON_SM_PACKAGE_COUNT + 1 == response.count
+    response = python_bindings.PublicationsPypiApi.list(pulp_domain=replica_domain.name)
+    assert 2 == response.count
+    add_to_cleanup(python_bindings.PublicationsPypiApi, response.results[0])
+    assert 1 == python_bindings.RepositoriesPythonApi.list(pulp_domain=replica_domain.name).count
+    assert 1 == python_bindings.DistributionsPypiApi.list(pulp_domain=replica_domain.name).count
+    assert 1 == python_bindings.RemotesPythonApi.list(pulp_domain=replica_domain.name).count
+
 
 @pytest.fixture
 def shelf_reader_cleanup():

{pulp-python-3.12.3 → pulp-python-3.12.5}/pulp_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.12.3
+Version: 3.12.5
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers

{pulp-python-3.12.3 → pulp-python-3.12.5}/pulp_python.egg-info/SOURCES.txt

@@ -19,6 +19,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/global_access_conditions.py
 pulp_python/app/modelresource.py
 pulp_python/app/models.py

{pulp-python-3.12.3 → pulp-python-3.12.5}/setup.py

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