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

@@ -145,7 +145,7 @@ 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
+        return str(file_path)
 
     yield _download_python_file
 

pulp_python/pytest_plugin.py

@@ -14,16 +14,16 @@
 @pytest.mark.parametrize("kwargs", [{}, {"policy": "on_demand"}])
 def test_remote_from_bandersnatch_config(kwargs, python_bindings, add_to_cleanup, tmp_path):
     """Verify whether it's possible to create a remote from a Bandersnatch config."""
-    filename = tmp_path / "bandersnatch.conf"
+    filename = str(tmp_path / "bandersnatch.conf")
     with open(filename, mode="wb") as config:
         config.write(BANDERSNATCH_CONF)
         config.flush()
     name = str(uuid.uuid4())
-    remote = python_bindings.RemotesPythonApi.from_bandersnatch(filename, name, **kwargs).to_dict()
-    add_to_cleanup(python_bindings.RemotesPythonApi, remote["pulp_href"])
+    remote = python_bindings.RemotesPythonApi.from_bandersnatch(filename, name, **kwargs)
+    add_to_cleanup(python_bindings.RemotesPythonApi, remote.pulp_href)
     expected = _gen_expected_remote_body(name, **kwargs)
     for key, val in expected.items():
-        assert remote[key] == val
+        assert getattr(remote, key) == val
 
 
 @pytest.mark.parallel
@@ -40,16 +40,18 @@ def test_remote_default_policy(python_bindings, gen_object_with_cleanup, monitor
 
 
 @pytest.mark.parallel
-def test_remote_invalid_project_specifier(python_bindings):
+def test_remote_invalid_project_specifier(python_bindings, has_pulp_plugin):
     """Test that creating a remote with an invalid project specifier fails."""
     # Test an include specifier without a "name" field.
     body = {
         "name": str(uuid.uuid4()),
         "url": "https://test",
         "includes": PYTHON_INVALID_SPECIFIER_NO_NAME,
     }
-    with pytest.raises(python_bindings.ApiException):
-        python_bindings.RemotesPythonApi.create(body)
+    # Pydantic addition to bindings in 3.70 prevent this test from working
+    if has_pulp_plugin("core", max="3.70"):
+        with pytest.raises(python_bindings.ApiException):
+            python_bindings.RemotesPythonApi.create(body)
 
     # Test an include specifier with an invalid "version_specifier" field value.
     body["includes"] = PYTHON_INVALID_SPECIFIER_BAD_VERSION
@@ -59,8 +61,9 @@ def test_remote_invalid_project_specifier(python_bindings):
     # Test an exclude specifier without a "name" field.
     body.pop("includes")
     body["excludes"] = PYTHON_INVALID_SPECIFIER_NO_NAME
-    with pytest.raises(python_bindings.ApiException):
-        python_bindings.RemotesPythonApi.create(body)
+    if has_pulp_plugin("core", max="3.70"):
+        with pytest.raises(python_bindings.ApiException):
+            python_bindings.RemotesPythonApi.create(body)
 
     # Test an exclude specifier with an invalid "version_specifier" field value.
     body["excludes"] = PYTHON_INVALID_SPECIFIER_BAD_VERSION
@@ -95,14 +98,17 @@ def test_remote_version_specifier(python_bindings, add_to_cleanup):
 
 
 @pytest.mark.parallel
-def test_remote_update_invalid_project_specifier(python_bindings, python_remote_factory):
+def test_remote_update_invalid_project_specifier(
+    python_bindings, python_remote_factory, has_pulp_plugin
+):
     """Test that updating a remote with an invalid project specifier fails non-destructively."""
     remote = python_remote_factory()
 
     # Test an include specifier without a "name" field.
     body = {"includes": PYTHON_INVALID_SPECIFIER_NO_NAME}
-    with pytest.raises(python_bindings.ApiException):
-        python_bindings.RemotesPythonApi.partial_update(remote.pulp_href, body)
+    if has_pulp_plugin("core", max="3.70"):
+        with pytest.raises(python_bindings.ApiException):
+            python_bindings.RemotesPythonApi.partial_update(remote.pulp_href, body)
 
     # Test an include specifier with an invalid "version_specifier" field value.
     body = {"includes": PYTHON_INVALID_SPECIFIER_BAD_VERSION}
@@ -111,8 +117,9 @@ def test_remote_update_invalid_project_specifier(python_bindings, python_remote_
 
     # Test an exclude specifier without a "name" field.
     body = {"excludes": PYTHON_INVALID_SPECIFIER_NO_NAME}
-    with pytest.raises(python_bindings.ApiException):
-        python_bindings.RemotesPythonApi.partial_update(remote.pulp_href, body)
+    if has_pulp_plugin("core", max="3.70"):
+        with pytest.raises(python_bindings.ApiException):
+            python_bindings.RemotesPythonApi.partial_update(remote.pulp_href, body)
 
     # Test an exclude specifier with an invalid "version_specifier" field value.
     body = {"excludes": PYTHON_INVALID_SPECIFIER_BAD_VERSION}

pulp_python/tests/functional/api/test_crud_remotes.py

@@ -82,14 +82,6 @@ def test_domain_object_creation(
     }
 
 
-@pytest.fixture
-def python_file(tmp_path, http_get):
-    filename = tmp_path / PYTHON_EGG_FILENAME
-    with open(filename, mode="wb") as f:
-        f.write(http_get(PYTHON_URL))
-    yield filename
-
-
 @pytest.mark.parallel
 def test_domain_content_upload(
     domain_factory,

pulp_python/tests/functional/api/test_domains.py

@@ -1,7 +1,6 @@
 import pytest
 import uuid
 
-from pulpcore.client.pulp_python import ApiException, AsyncOperationResponse
 from pulp_python.tests.functional.constants import (
     PYTHON_EGG_FILENAME,
     PYTHON_EGG_SHA256,
@@ -27,19 +26,28 @@ def _gen_users(role_names=list()):
 
 
 @pytest.fixture
-def try_action(monitor_task):
+def try_action(python_bindings, monitor_task):
     def _try_action(user, client, action, outcome, *args, **kwargs):
         action_api = getattr(client, f"{action}_with_http_info")
         try:
             with user:
-                response, status, _ = action_api(*args, **kwargs, _return_http_data_only=False)
-            if isinstance(response, AsyncOperationResponse):
-                response = monitor_task(response.task)
-        except ApiException as e:
+                response = action_api(*args, **kwargs)
+            if isinstance(response, tuple):
+                # old bindings
+                data, status_code, _ = response
+            else:
+                # new bindings
+                data = response.data
+                status_code = response.status_code
+            if isinstance(data, python_bindings.module.AsyncOperationResponse):
+                data = monitor_task(data.task)
+        except python_bindings.module.ApiException as e:
             assert e.status == outcome, f"{e}"
         else:
-            assert status == outcome, f"User performed {action} when they shouldn't been able to"
-            return response
+            assert (
+                status_code == outcome
+            ), f"User performed {action} when they shouldn't been able to"
+            return data
 
     return _try_action
 

pulp_python/tests/functional/api/test_rbac.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",