pulp-python 3.11.3__tar.gz → 3.11.4__tar.gz

{pulp-python-3.11.3 → pulp_python-3.11.4}/CHANGES.md

@@ -8,6 +8,19 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.11.4 (2025-02-20) {: #3.11.4 }
+
+#### Bugfixes {: #3.11.4-bugfix }
+
+- Fixed the JSONField specification so it doesn't break ruby bindings.
+  See context [here](https://github.com/pulp/pulp_rpm/issues/3639).
+
+#### Misc {: #3.11.4-misc }
+
+- 
+
+---
+
 # ## 3.11.3 (2024-08-21) {: #3.11.3 }
 
 #### Bugfixes {: #3.11.3-bugfix }

{pulp-python-3.11.3 → pulp_python-3.11.4}/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.11.3 → pulp_python-3.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pulp-python
-Version: 3.11.3
+Version: 3.11.4
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers
@@ -17,6 +17,20 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pulpcore<3.55,>=3.28
+Requires-Dist: pkginfo<1.13.0,>=1.12.0
+Requires-Dist: bandersnatch<6.2,>=6.1
+Requires-Dist: pypi-simple<1.0.0,>=0.9.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # pulp_python
 

{pulp-python-3.11.3 → pulp_python-3.11.4}/functest_requirements.txt

@@ -3,3 +3,5 @@ pytest<8
 lxml
 twine
 pypi-simple
+pytest-xdist
+pytest-timeout

{pulp-python-3.11.3 → pulp_python-3.11.4}/pulp_python/app/__init__.py

@@ -8,5 +8,5 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.11.3"
+    version = "3.11.4"
     python_package_name = "pulp-python"

pulp_python-3.11.4/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.11.3 → pulp_python-3.11.4}/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 django.db.utils import IntegrityError
 
@@ -27,9 +28,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.11.3 → pulp_python-3.11.4}/pulp_python/app/serializers.py

@@ -7,6 +7,7 @@ from pulpcore.plugin import models as core_models
 from pulpcore.plugin import serializers as core_serializers
 
 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
 
 
@@ -154,7 +155,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.')
     )
@@ -167,28 +168,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.11.3 → pulp_python-3.11.4}/pulp_python/tests/functional/api/test_crud_content_unit.py

@@ -242,3 +242,16 @@ def test_upload_metadata_23_spec(python_content_factory):
                 content = python_content_factory(filename, url=package.url)
                 assert content.metadata_version == "2.3"
                 break
+
+
+@pytest.mark.parallel
+def test_upload_metadata_24_spec(python_content_factory):
+    """Test that packages using metadata spec 2.4 can be uploaded to pulp."""
+    filename = "urllib3-2.3.0-py3-none-any.whl"
+    with PyPISimple() as client:
+        page = client.get_project_page("urllib3")
+        for package in page.packages:
+            if package.filename == filename:
+                content = python_content_factory(filename, url=package.url)
+                assert content.metadata_version == "2.4"
+                break

{pulp-python-3.11.3 → pulp_python-3.11.4}/pulp_python/tests/functional/api/test_pypi_apis.py

@@ -3,10 +3,11 @@ import os
 import requests
 import subprocess
 import tempfile
+import pytest
 
 from urllib.parse import urljoin
 
-from pulp_smash.pulp3.bindings import monitor_task, tasks as task_api
+from pulp_smash.pulp3.bindings import monitor_task
 from pulp_smash.pulp3.utils import get_added_content_summary, get_content_summary
 from pulp_python.tests.functional.constants import (
     PYTHON_CONTENT_NAME,
@@ -40,6 +41,32 @@ HOST = client.configuration.host
 PYPI_HOST = urljoin(HOST, PULP_PYPI_BASE_URL)
 
 
+@pytest.fixture
+def python_empty_repo_distro(python_repo_factory, python_distribution_factory):
+    """Returns an empty repo with and distribution serving it."""
+    def _generate_empty_repo_distro(repo_body=None, distro_body=None):
+        repo_body = repo_body or {}
+        distro_body = distro_body or {}
+        repo = python_repo_factory(**repo_body)
+        distro = python_distribution_factory(repository=repo.pulp_href, **distro_body)
+        return repo, distro
+
+    yield _generate_empty_repo_distro
+
+
+@pytest.fixture(scope="module")
+def python_package_dist_directory(tmp_path_factory, http_get):
+    """Creates a temp dir to hold package distros for uploading."""
+    dist_dir = tmp_path_factory.mktemp("dist")
+    egg_file = dist_dir / PYTHON_EGG_FILENAME
+    wheel_file = dist_dir / PYTHON_WHEEL_FILENAME
+    with open(egg_file, "wb") as f:
+        f.write(http_get(PYTHON_EGG_URL))
+    with open(wheel_file, "wb") as f:
+        f.write(http_get(PYTHON_WHEEL_URL))
+    yield dist_dir, egg_file, wheel_file
+
+
 class PyPISummaryTestCase(TestCaseUsingBindings, TestHelpersMixin):
     """Tests the summary response of the base url of an index."""
 
@@ -162,18 +189,51 @@ class PyPIPackageUpload(TestCaseUsingBindings, TestHelpersMixin):
         content = get_added_content_summary(repo, f"{repo.versions_href}1/")
         self.assertDictEqual({PYTHON_CONTENT_NAME: 1}, content)
 
-    def test_twine_upload(self):
-        """Tests that packages can be properly uploaded through Twine."""
-        repo, distro = self._create_empty_repo_and_distribution()
-        url = urljoin(PYPI_HOST, distro.base_path + "/legacy/")
-        username, password = "admin", "password"
+
+@pytest.mark.parallel
+def test_twine_upload(
+    pulpcore_bindings,
+    python_content_summary,
+    python_empty_repo_distro,
+    python_package_dist_directory,
+    monitor_task,
+):
+    """Tests that packages can be properly uploaded through Twine."""
+    repo, distro = python_empty_repo_distro()
+    url = urljoin(distro.base_url, "legacy/")
+    dist_dir, _, _ = python_package_dist_directory
+    username, password = "admin", "password"
+    subprocess.run(
+        (
+            "twine",
+            "upload",
+            "--repository-url",
+            url,
+            dist_dir / "*",
+            "-u",
+            username,
+            "-p",
+            password,
+        ),
+        capture_output=True,
+        check=True,
+    )
+    tasks = pulpcore_bindings.TasksApi.list(reserved_resources=repo.pulp_href).results
+    for task in reversed(tasks):
+        t = monitor_task(task.pulp_href)
+        repo_ver_href = t.created_resources[-1]
+    summary = python_content_summary(repository_version=repo_ver_href)
+    assert summary.present["python.python"]["count"] == 2
+
+    # Test re-uploading same packages gives error
+    with pytest.raises(subprocess.CalledProcessError):
         subprocess.run(
             (
                 "twine",
                 "upload",
                 "--repository-url",
                 url,
-                self.dists_dir.name + "/*",
+                dist_dir / "*",
                 "-u",
                 username,
                 "-p",
@@ -182,50 +242,26 @@ class PyPIPackageUpload(TestCaseUsingBindings, TestHelpersMixin):
             capture_output=True,
             check=True,
         )
-        tasks = task_api.list(reserved_resources_record=[repo.pulp_href]).results
-        for task in reversed(tasks):
-            t = monitor_task(task.pulp_href)
-            repo_ver_href = t.created_resources[-1]
-        content = get_content_summary(repo, f"{repo_ver_href}")
-        self.assertDictEqual({PYTHON_CONTENT_NAME: 2}, content)
 
-        # Test re-uploading same packages gives error
-        with self.assertRaises(subprocess.CalledProcessError):
-            subprocess.run(
-                (
-                    "twine",
-                    "upload",
-                    "--repository-url",
-                    url,
-                    self.dists_dir.name + "/*",
-                    "-u",
-                    username,
-                    "-p",
-                    password,
-                ),
-                capture_output=True,
-                check=True,
-            )
-
-        # Test re-uploading same packages with --skip-existing works
-        output = subprocess.run(
-            (
-                "twine",
-                "upload",
-                "--repository-url",
-                url,
-                self.dists_dir.name + "/*",
-                "-u",
-                username,
-                "-p",
-                password,
-                "--skip-existing",
-            ),
-            capture_output=True,
-            check=True,
-            text=True
-        )
-        self.assertEqual(output.stdout.count("Skipping"), 2)
+    # Test re-uploading same packages with --skip-existing works
+    output = subprocess.run(
+        (
+            "twine",
+            "upload",
+            "--repository-url",
+            url,
+            dist_dir / "*",
+            "-u",
+            username,
+            "-p",
+            password,
+            "--skip-existing",
+        ),
+        capture_output=True,
+        check=True,
+        text=True
+    )
+    assert output.stdout.count("Skipping") == 2
 
 
 class PyPISimpleApi(TestCaseUsingBindings, TestHelpersMixin):

{pulp-python-3.11.3 → pulp_python-3.11.4}/pulp_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pulp-python
-Version: 3.11.3
+Version: 3.11.4
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers
@@ -17,6 +17,20 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pulpcore<3.55,>=3.28
+Requires-Dist: pkginfo<1.13.0,>=1.12.0
+Requires-Dist: bandersnatch<6.2,>=6.1
+Requires-Dist: pypi-simple<1.0.0,>=0.9.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # pulp_python
 

{pulp-python-3.11.3 → pulp_python-3.11.4}/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/fields.py
 pulp_python/app/modelresource.py
 pulp_python/app/models.py
 pulp_python/app/serializers.py

{pulp-python-3.11.3 → pulp_python-3.11.4}/pulp_python.egg-info/requires.txt

@@ -1,4 +1,4 @@
 pulpcore<3.55,>=3.28
-pkginfo<1.12.0,>=1.10.0
+pkginfo<1.13.0,>=1.12.0
 bandersnatch<6.2,>=6.1
 pypi-simple<1.0.0,>=0.9.0

pulp_python-3.11.4/pyproject.toml

@@ -0,0 +1,74 @@
+[tool.towncrier]
+package = "pulp_python"
+filename = "CHANGES.md"
+directory = "CHANGES/"
+title_format = "## {version} ({project_date}) {{: #{version} }}"
+template = "CHANGES/.TEMPLATE.md"
+issue_format = "[#{issue}](https://github.com/pulp/pulp_python/issues/{issue})"
+start_string = "[//]: # (towncrier release notes start)\n"
+underlines = ["", "", ""]
+
+[tool.check-manifest]
+ignore = [
+    ".bumpversion.cfg",
+    ".pep8speaks.yml",
+    "CHANGES/**",
+    "CONTRIBUTING.rst",
+    "HISTORY.rst",
+    "dev_requirements.txt",
+    "doc_requirements.txt",
+    "docs/**",
+    "template_config.yml",
+    ".travis/**",
+    ".travis.yml",
+    "shelf_reader-0.1-py2-none-any.whl",
+    ".github/**",
+    ".ci/**",
+    "lint_requirements.txt",
+    ".flake8",
+]
+
+[tool.bumpversion]
+# This section is managed by the plugin template. Do not edit manually.
+
+current_version = "3.11.4"
+commit = false
+tag = false
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
+serialize = [
+  "{major}.{minor}.{patch}.{release}",
+  "{major}.{minor}.{patch}",
+  "{major}.{minor}.{alpha}{patch}.{release}",
+  "{major}.{minor}.{alpha}{patch}",
+]
+
+[tool.bumpversion.parts.alpha]
+# This section is managed by the plugin template. Do not edit manually.
+
+# This is sort of a hack. In PEP440 prerelease markers work quite differently.
+# But this fits best with the way we have been doing release versions.
+optional_value = "final"
+values = [
+  "0a",
+  "final",
+]
+independent = true
+
+[tool.bumpversion.parts.release]
+# This section is managed by the plugin template. Do not edit manually.
+
+optional_value = "prod"
+values = [
+  "dev",
+  "prod",
+]
+
+[[tool.bumpversion.files]]
+# This section is managed by the plugin template. Do not edit manually.
+
+filename = "./pulp_python/app/__init__.py"
+search = "version = \"{current_version}\""
+replace = "version = \"{new_version}\""
+
+[[tool.bumpversion.files]]
+filename = "./setup.py"

{pulp-python-3.11.3 → pulp_python-3.11.4}/requirements.txt

@@ -1,4 +1,4 @@
 pulpcore>=3.28,<3.55
-pkginfo>=1.10.0,<1.12.0  # Twine has <1.11 in their requirements
+pkginfo>=1.12.0,<1.13.0
 bandersnatch>=6.1,<6.2
 pypi-simple>=0.9.0,<1.0.0

{pulp-python-3.11.3 → pulp_python-3.11.4}/setup.py

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

pulp-python-3.11.3/pyproject.toml

@@ -1,29 +0,0 @@
-[tool.towncrier]
-package = "pulp_python"
-filename = "CHANGES.md"
-directory = "CHANGES/"
-title_format = "## {version} ({project_date}) {{: #{version} }}"
-template = "CHANGES/.TEMPLATE.md"
-issue_format = "[#{issue}](https://github.com/pulp/pulp_python/issues/{issue})"
-start_string = "[//]: # (towncrier release notes start)\n"
-underlines = ["", "", ""]
-
-[tool.check-manifest]
-ignore = [
-    ".bumpversion.cfg",
-    ".pep8speaks.yml",
-    "CHANGES/**",
-    "CONTRIBUTING.rst",
-    "HISTORY.rst",
-    "dev_requirements.txt",
-    "doc_requirements.txt",
-    "docs/**",
-    "template_config.yml",
-    ".travis/**",
-    ".travis.yml",
-    "shelf_reader-0.1-py2-none-any.whl",
-    ".github/**",
-    ".ci/**",
-    "lint_requirements.txt",
-    ".flake8",
-]