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

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

@@ -8,6 +8,15 @@
 
 [//]: # (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 }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.12.4
+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.4 → 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.4"
+    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.4 → 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.4 → 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.4 → 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.4
+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.4 → 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.4 → pulp-python-3.12.5}/setup.py

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