Declare compatibility with pulpcore 3.70

Author: gerrod3

.github/workflows/scripts/install.sh

@@ -97,7 +97,7 @@ minio_access_key: "'$MINIO_ACCESS_KEY'"\
 minio_secret_key: "'$MINIO_SECRET_KEY'"\
 pulp_scenario_settings: {"domain_enabled": true}\
 pulp_scenario_env: {}\
-test_storages_compat_layer: false\
+test_storages_compat_layer: true\
 ' vars/main.yaml
   export PULP_API_ROOT="/rerouted/djnd/"
 fi

CHANGES/+pulpcore-3.70.feature

@@ -0,0 +1 @@
+Added pulpcore 3.70 compatibility

pulp_python/app/fields.py

@@ -3,7 +3,6 @@
 
 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
@@ -29,9 +28,9 @@ class PackageMetadataSerializer(serializers.Serializer):
     """
 
     last_serial = serializers.IntegerField(help_text=_("Cache value from last PyPI sync"))
-    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()
+    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()
 
 
 class PackageUploadSerializer(serializers.Serializer):

pulp_python/app/pypi/serializers.py

@@ -8,7 +8,6 @@
 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 artifact_to_python_content_data
 
 
@@ -158,7 +157,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 = fields.JSONObjectField(
+    project_urls = serializers.JSONField(
         required=False, default=dict,
         help_text=_('A dictionary of labels and URLs for the project.')
     )
@@ -171,28 +170,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 = fields.JSONObjectField(
+    requires_dist = serializers.JSONField(
         required=False, default=list,
         help_text=_('A JSON list containing names of some other distutils project '
                     'required by this distribution.')
     )
-    provides_dist = fields.JSONObjectField(
+    provides_dist = serializers.JSONField(
         required=False, default=list,
         help_text=_('A JSON list containing names of a Distutils project which is contained'
                     ' within this distribution.')
     )
-    obsoletes_dist = fields.JSONObjectField(
+    obsoletes_dist = serializers.JSONField(
         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 = fields.JSONObjectField(
+    requires_external = serializers.JSONField(
         required=False, default=list,
         help_text=_('A JSON list containing some dependency in the system that the distribution '
                     'is to be used.')
     )
-    classifiers = fields.JSONObjectField(
+    classifiers = serializers.JSONField(
         required=False, default=list,
         help_text=_('A JSON list containing classification values for a Python package.')
     )

pulp_python/app/serializers.py

@@ -27,7 +27,7 @@ classifiers=[
 ]
 requires-python = ">=3.9"
 dependencies = [
-  "pulpcore>=3.49.0,<3.70",
+  "pulpcore>=3.49.0,<3.85",
   "pkginfo>=1.10.0,<1.12.0",  # Twine has <1.11 in their requirements
   "bandersnatch>=6.3,<7.0",  # Anything >6.3 requires Python 3.10+
   "pypi-simple>=1.5.0,<2.0",

pyproject.toml

@@ -68,6 +68,6 @@ test_lowerbounds: true
 test_performance: false
 test_reroute: true
 test_s3: true
-test_storages_compat_layer: false
+test_storages_compat_layer: true
 use_issue_template: true