pulp-python 3.13.5__py3-none-any.whl → 3.13.7__py3-none-any.whl

pulp_python/__init__.py

@@ -1 +1 @@
-default_app_config = 'pulp_python.app.PulpPythonPluginAppConfig'
+default_app_config = "pulp_python.app.PulpPythonPluginAppConfig"

pulp_python/app/__init__.py

@@ -1,6 +1,8 @@
+from gettext import gettext as _
+
 from django.db.models.signals import post_migrate
+
 from pulpcore.plugin import PulpPluginAppConfig
-from gettext import gettext as _
 
 
 class PulpPythonPluginAppConfig(PulpPluginAppConfig):
@@ -10,7 +12,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.13.5"
+    version = "3.13.7"
     python_package_name = "pulp-python"
     domain_compatible = True
 
@@ -26,7 +28,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
 # TODO: Remove this when https://github.com/pulp/pulpcore/issues/5500 is resolved
 def _populate_pypi_access_policies(sender, apps, verbosity, **kwargs):
-    from pulp_python.app.pypi.views import PyPIView, SimpleView, UploadView, MetadataView
+    from pulp_python.app.pypi.views import MetadataView, PyPIView, SimpleView, UploadView
 
     try:
         AccessPolicy = apps.get_model("core", "AccessPolicy")

pulp_python/app/global_access_conditions.py

@@ -1,6 +1,5 @@
 from django.conf import settings
 
-
 # Access Condition methods that can be used with PyPI access policies
 
 

pulp_python/app/management/commands/repair-python-metadata.py

@@ -1,11 +1,12 @@
-import re
 import os
-from django.core.management import BaseCommand, CommandError
+import re
 from gettext import gettext as _
 
 from django.conf import settings
+from django.core.management import BaseCommand, CommandError
 
 from pulpcore.plugin.util import extract_pk
+
 from pulp_python.app.models import PythonPackageContent, PythonRepository
 from pulp_python.app.utils import artifact_to_python_content_data
 
@@ -23,7 +24,7 @@ def repair_metadata(content):
     batch = []
     set_of_update_fields = set()
     total_repaired = 0
-    for package in immediate_content.prefetch_related('_artifacts').iterator(chunk_size=1000):
+    for package in immediate_content.prefetch_related("_artifacts").iterator(chunk_size=1000):
         new_data = artifact_to_python_content_data(
             package.filename, package._artifacts.get(), package.pulp_domain
         )
@@ -55,7 +56,7 @@ def href_prn_list_handler(value):
         (?:{settings.API_ROOT}(?:[-_a-zA-Z0-9]+/)?api/v3/repositories/python/python/[-a-f0-9]+/)
         |(?:prn:python\.pythonrepository:[-a-f0-9]+)
         """,
-        re.VERBOSE
+        re.VERBOSE,
     )
     values = []
     for v in value.split(","):

pulp_python/app/modelresource.py

@@ -1,6 +1,7 @@
 from pulpcore.plugin.importexport import BaseContentResource
 from pulpcore.plugin.modelresources import RepositoryResource
 from pulpcore.plugin.util import get_domain
+
 from pulp_python.app.models import (
     PythonPackageContent,
     PythonRepository,

pulp_python/app/models.py

@@ -1,30 +1,31 @@
 from logging import getLogger
+from pathlib import PurePath
 
 from aiohttp.web import json_response
+from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
-from django.conf import settings
+
 from pulpcore.plugin.models import (
     AutoAddObjPermsMixin,
     Content,
-    Publication,
     Distribution,
+    Publication,
     Remote,
     Repository,
 )
+from pulpcore.plugin.repo_version_utils import remove_duplicates, validate_repo_version
 from pulpcore.plugin.responses import ArtifactResponse
+from pulpcore.plugin.util import get_domain, get_domain_pk
 
-from pathlib import PurePath
 from .utils import (
+    PYPI_LAST_SERIAL,
+    PYPI_SERIAL_CONSTANT,
     artifact_to_python_content_data,
     canonicalize_name,
     python_content_to_json,
-    PYPI_LAST_SERIAL,
-    PYPI_SERIAL_CONSTANT,
 )
-from pulpcore.plugin.repo_version_utils import remove_duplicates, validate_repo_version
-from pulpcore.plugin.util import get_domain_pk, get_domain
 
 log = getLogger(__name__)
 

pulp_python/app/pypi/serializers.py

@@ -1,11 +1,13 @@
 import logging
 from gettext import gettext as _
 
+from django.db.utils import IntegrityError
 from rest_framework import serializers
-from pulp_python.app.utils import DIST_EXTENSIONS
+
 from pulpcore.plugin.models import Artifact
 from pulpcore.plugin.util import get_domain
-from django.db.utils import IntegrityError
+
+from pulp_python.app.utils import DIST_EXTENSIONS
 
 log = logging.getLogger(__name__)
 
@@ -46,7 +48,7 @@ class PackageUploadSerializer(serializers.Serializer):
     action = serializers.CharField(
         help_text=_("Defaults to `file_upload`, don't change it or request will fail!"),
         default="file_upload",
-        source=":action"
+        source=":action",
     )
     sha256_digest = serializers.CharField(
         help_text=_("SHA256 of package to validate upload integrity."),
@@ -59,17 +61,17 @@ class PackageUploadSerializer(serializers.Serializer):
         """Validates the request."""
         action = data.get(":action")
         if action != "file_upload":
-            raise serializers.ValidationError(
-                _("We do not support the :action {}").format(action)
-            )
+            raise serializers.ValidationError(_("We do not support the :action {}").format(action))
         file = data.get("content")
         for ext, packagetype in DIST_EXTENSIONS.items():
             if file.name.endswith(ext):
                 break
         else:
-            raise serializers.ValidationError(_(
-                "Extension on {} is not a valid python extension "
-                "(.whl, .exe, .egg, .tar.gz, .tar.bz2, .zip)").format(file.name)
+            raise serializers.ValidationError(
+                _(
+                    "Extension on {} is not a valid python extension "
+                    "(.whl, .exe, .egg, .tar.gz, .tar.bz2, .zip)"
+                ).format(file.name)
             )
         sha256 = data.get("sha256_digest")
         digests = {"sha256": sha256} if sha256 else None

pulp_python/app/pypi/views.py

@@ -1,54 +1,53 @@
 import logging
-import requests
-
-from rest_framework.viewsets import ViewSet
-from rest_framework.response import Response
-from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import redirect
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta, timezone
+from itertools import chain
+from pathlib import PurePath
+from urllib.parse import urljoin, urlparse, urlunsplit
 
-from rest_framework.reverse import reverse
+import requests
 from django.contrib.sessions.models import Session
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
 from django.db.utils import DatabaseError
 from django.http.response import (
     Http404,
-    HttpResponseForbidden,
     HttpResponseBadRequest,
-    StreamingHttpResponse
+    HttpResponseForbidden,
+    StreamingHttpResponse,
 )
+from django.shortcuts import redirect
 from drf_spectacular.utils import extend_schema
 from dynaconf import settings
-from itertools import chain
 from packaging.utils import canonicalize_name
-from urllib.parse import urljoin, urlparse, urlunsplit
-from pathlib import PurePath
 from pypi_simple import parse_links_stream_response
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+from rest_framework.viewsets import ViewSet
 
-from pulpcore.plugin.viewsets import OperationPostponedResponse
 from pulpcore.plugin.tasking import dispatch
 from pulpcore.plugin.util import get_domain
+from pulpcore.plugin.viewsets import OperationPostponedResponse
+
+from pulp_python.app import tasks
 from pulp_python.app.models import (
     PythonDistribution,
     PythonPackageContent,
     PythonPublication,
 )
 from pulp_python.app.pypi.serializers import (
-    SummarySerializer,
     PackageMetadataSerializer,
     PackageUploadSerializer,
-    PackageUploadTaskSerializer
+    PackageUploadTaskSerializer,
+    SummarySerializer,
 )
 from pulp_python.app.utils import (
-    write_simple_index,
-    write_simple_detail,
-    python_content_to_json,
     PYPI_LAST_SERIAL,
     PYPI_SERIAL_CONSTANT,
+    python_content_to_json,
+    write_simple_detail,
+    write_simple_index,
 )
 
-from pulp_python.app import tasks
-
 log = logging.getLogger(__name__)
 
 ORIGIN_HOST = settings.CONTENT_ORIGIN if settings.CONTENT_ORIGIN else settings.PYPI_API_HOSTNAME
@@ -159,10 +158,15 @@ class PackageUploadMixin(PyPIMixin):
         if settings.PYTHON_GROUP_UPLOADS:
             return self.upload_package_group(repo, artifact, filename, request.session)
 
-        result = dispatch(tasks.upload, exclusive_resources=[artifact, repo],
-                          kwargs={"artifact_sha256": artifact.sha256,
-                                  "filename": filename,
-                                  "repository_pk": str(repo.pk)})
+        result = dispatch(
+            tasks.upload,
+            exclusive_resources=[artifact, repo],
+            kwargs={
+                "artifact_sha256": artifact.sha256,
+                "filename": filename,
+                "repository_pk": str(repo.pk),
+            },
+        )
         return OperationPostponedResponse(result, request)
 
     def upload_package_group(self, repo, artifact, filename, session):
@@ -176,10 +180,10 @@ class PackageUploadMixin(PyPIMixin):
             try:
                 with transaction.atomic():
                     sq.first()
-                    current_start = datetime.fromisoformat(session['start'])
+                    current_start = datetime.fromisoformat(session["start"])
                     if current_start >= datetime.now(tz=timezone.utc):
-                        session['artifacts'].append((str(artifact.sha256), filename))
-                        session['start'] = str(start_time)
+                        session["artifacts"].append((str(artifact.sha256), filename))
+                        session["start"] = str(start_time)
                         session.modified = False
                         session.save()
                     else:
@@ -192,14 +196,19 @@ class PackageUploadMixin(PyPIMixin):
 
     def create_group_upload_task(self, cur_session, repository, artifact, filename, start_time):
         """Creates the actual task that adds the packages to the index."""
-        cur_session['start'] = str(start_time)
-        cur_session['artifacts'] = [(str(artifact.sha256), filename)]
+        cur_session["start"] = str(start_time)
+        cur_session["artifacts"] = [(str(artifact.sha256), filename)]
         cur_session.modified = False
         cur_session.save()
-        result = dispatch(tasks.upload_group, exclusive_resources=[artifact, repository],
-                          kwargs={"session_pk": str(cur_session.session_key),
-                                  "repository_pk": str(repository.pk)})
-        return reverse('tasks-detail', args=[result.pk], request=None)
+        result = dispatch(
+            tasks.upload_group,
+            exclusive_resources=[artifact, repository],
+            kwargs={
+                "session_pk": str(cur_session.session_key),
+                "repository_pk": str(repository.pk),
+            },
+        )
+        return reverse("tasks-detail", args=[result.pk], request=None)
 
 
 class SimpleView(PackageUploadMixin, ViewSet):
@@ -227,21 +236,22 @@ class SimpleView(PackageUploadMixin, ViewSet):
         """Gets the simple api html page for the index."""
         repo_version, content = self.get_rvc()
         if self.should_redirect(repo_version=repo_version):
-            return redirect(urljoin(self.base_content_url, f'{path}/simple/'))
-        names = content.order_by('name').values_list('name', flat=True).distinct().iterator()
+            return redirect(urljoin(self.base_content_url, f"{path}/simple/"))
+        names = content.order_by("name").values_list("name", flat=True).distinct().iterator()
         return StreamingHttpResponse(write_simple_index(names, streamed=True))
 
     def pull_through_package_simple(self, package, path, remote):
         """Gets the package's simple page from remote."""
+
         def parse_url(link):
             parsed = urlparse(link.url)
-            digest, _, value = parsed.fragment.partition('=')
+            digest, _, value = parsed.fragment.partition("=")
             stripped_url = urlunsplit(chain(parsed[:3], ("", "")))
-            redirect = f'{path}/{link.text}?redirect={stripped_url}'
+            redirect = f"{path}/{link.text}?redirect={stripped_url}"
             d_url = urljoin(self.base_content_url, redirect)
-            return link.text, d_url, value if digest == 'sha256' else ''
+            return link.text, d_url, value if digest == "sha256" else ""
 
-        url = remote.get_remote_artifact_url(f'simple/{package}/')
+        url = remote.get_remote_artifact_url(f"simple/{package}/")
         kwargs = {}
         if proxy_url := remote.proxy_url:
             if remote.proxy_username or remote.proxy_password:
@@ -265,10 +275,10 @@ class SimpleView(PackageUploadMixin, ViewSet):
             if not repo_ver or not content.filter(name__normalize=normalized).exists():
                 return self.pull_through_package_simple(normalized, path, self.distribution.remote)
         if self.should_redirect(repo_version=repo_ver):
-            return redirect(urljoin(self.base_content_url, f'{path}/simple/{normalized}/'))
+            return redirect(urljoin(self.base_content_url, f"{path}/simple/{normalized}/"))
         packages = (
             content.filter(name__normalize=normalized)
-            .values_list('filename', 'sha256', 'name')
+            .values_list("filename", "sha256", "name")
             .iterator()
         )
         try:
@@ -278,12 +288,14 @@ class SimpleView(PackageUploadMixin, ViewSet):
         else:
             packages = chain([present], packages)
             name = present[2]
-        releases = ((f, urljoin(self.base_content_url, f'{path}/{f}'), d) for f, d, _ in packages)
+        releases = ((f, urljoin(self.base_content_url, f"{path}/{f}"), d) for f, d, _ in packages)
         return StreamingHttpResponse(write_simple_detail(name, releases, streamed=True))
 
-    @extend_schema(request=PackageUploadSerializer,
-                   responses={200: PackageUploadTaskSerializer},
-                   summary="Upload a package")
+    @extend_schema(
+        request=PackageUploadSerializer,
+        responses={200: PackageUploadTaskSerializer},
+        summary="Upload a package",
+    )
     def create(self, request, path):
         """
         Upload package to the index.
@@ -308,9 +320,11 @@ class MetadataView(PyPIMixin, ViewSet):
         ],
     }
 
-    @extend_schema(tags=["Pypi: Metadata"],
-                   responses={200: PackageMetadataSerializer},
-                   summary="Get package metadata")
+    @extend_schema(
+        tags=["Pypi: Metadata"],
+        responses={200: PackageMetadataSerializer},
+        summary="Get package metadata",
+    )
     def retrieve(self, request, path, meta):
         """
         Retrieves the package's core-metadata specified by
@@ -356,8 +370,7 @@ class PyPIView(PyPIMixin, ViewSet):
         ],
     }
 
-    @extend_schema(responses={200: SummarySerializer},
-                   summary="Get index summary")
+    @extend_schema(responses={200: SummarySerializer}, summary="Get index summary")
     def retrieve(self, request, path):
         """Gets package summary stats of index."""
         repo_ver, content = self.get_rvc()
@@ -383,9 +396,11 @@ class UploadView(PackageUploadMixin, ViewSet):
         ],
     }
 
-    @extend_schema(request=PackageUploadSerializer,
-                   responses={200: PackageUploadTaskSerializer},
-                   summary="Upload a package")
+    @extend_schema(
+        request=PackageUploadSerializer,
+        responses={200: PackageUploadTaskSerializer},
+        summary="Upload a package",
+    )
     def create(self, request, path):
         """
         Upload package to the index.

pulp_python/app/replica.py

@@ -1,10 +1,11 @@
-from pulpcore.plugin.replica import Replicator
-
 from pulp_glue.python.context import (
     PulpPythonDistributionContext,
     PulpPythonPublicationContext,
     PulpPythonRepositoryContext,
 )
+
+from pulpcore.plugin.replica import Replicator
+
 from pulp_python.app.models import PythonDistribution, PythonRemote, PythonRepository
 from pulp_python.app.tasks import sync as python_sync
 
@@ -31,7 +32,8 @@ class PythonReplicator(Replicator):
     def url(self, upstream_distribution):
         # Ignore distributions that are only pull-through
         repo, pub = upstream_distribution["repository"], upstream_distribution["publication"]
-        if repo or pub:
+        repo_ver = upstream_distribution.get("repository_version")
+        if repo or pub or repo_ver:
             return super().url(upstream_distribution)
 
         return None