pulp-python 3.30.1__py3-none-any.whl → 3.30.3__py3-none-any.whl

pulp_python/app/__init__.py

@@ -12,7 +12,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.30.1"
+    version = "3.30.3"
     python_package_name = "pulp-python"
     domain_compatible = True
 

pulp_python/app/pypi/views.py

@@ -7,7 +7,7 @@ from urllib.parse import urljoin, urlparse, urlunsplit
 from django.contrib.sessions.models import Session
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
-from django.db.models import OuterRef, Subquery
+from django.db.models import Exists, F, FilteredRelation, OuterRef, Q
 from django.db.utils import DatabaseError
 from django.http.response import (
     Http404,
@@ -26,7 +26,6 @@ from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer, Templat
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
-from pulpcore.plugin.models import RepositoryContent
 from pulpcore.plugin.tasking import dispatch
 from pulpcore.plugin.util import get_domain, get_url
 from pulpcore.plugin.viewsets import OperationPostponedResponse
@@ -368,13 +367,16 @@ class SimpleView(PackageUploadMixin, ViewSet):
             return redirect(urljoin(self.base_content_url, f"{path}/simple/{normalized}/"))
         if content is not None:
             local_packages = content.filter(name_normalized=normalized)
-            repo_added_subquery = RepositoryContent.objects.filter(
-                content_id=OuterRef("pk"),
-                repository=repo_ver.repository,
-                version_removed=None,
-            ).values("pulp_created")[:1]
             packages = local_packages.annotate(
-                repo_added_time=Subquery(repo_added_subquery)
+                active_membership=FilteredRelation(
+                    "version_memberships",
+                    condition=Q(
+                        version_memberships__repository=repo_ver.repository,
+                        version_memberships__version_removed=None,
+                    ),
+                ),
+                repo_added_time=F("active_membership__pulp_created"),
+                has_provenance=Exists(PackageProvenance.objects.filter(package_id=OuterRef("pk"))),
             ).values(
                 "filename",
                 "sha256",
@@ -383,9 +385,7 @@ class SimpleView(PackageUploadMixin, ViewSet):
                 "size",
                 "repo_added_time",
                 "version",
-            )
-            provenances = PackageProvenance.objects.filter(package__in=local_packages).values_list(
-                "package__filename", flat=True
+                "has_provenance",
             )
             local_releases = {
                 p["filename"]: {
@@ -394,7 +394,7 @@ class SimpleView(PackageUploadMixin, ViewSet):
                     "upload_time": p["repo_added_time"],
                     "provenance": (
                         self.get_provenance_url(normalized, p["version"], p["filename"])
-                        if p["filename"] in provenances
+                        if p["has_provenance"]
                         else None
                     ),
                 }

pulp_python/app/utils.py

@@ -11,7 +11,7 @@ from datetime import timezone
 import pkginfo
 from aiohttp.client_exceptions import ClientError
 from django.conf import settings
-from django.db.models import OuterRef, Subquery
+from django.db.models import F, FilteredRelation, Q
 from django.db.utils import IntegrityError
 from jinja2 import Template
 from packaging.requirements import Requirement
@@ -20,7 +20,7 @@ from packaging.version import InvalidVersion, parse
 from pypi_simple import ACCEPT_JSON_PREFERRED, ProjectPage
 
 from pulpcore.plugin.exceptions import TimeoutException
-from pulpcore.plugin.models import Artifact, Remote, RepositoryContent
+from pulpcore.plugin.models import Artifact, Remote
 from pulpcore.plugin.util import get_domain
 
 log = logging.getLogger(__name__)
@@ -375,12 +375,16 @@ def python_content_to_json(
     Returns None if version is specified but not found within content_query
     """
     if repository_version:
-        repo_added_subquery = RepositoryContent.objects.filter(
-            content_id=OuterRef("pk"),
-            repository=repository_version.repository,
-            version_removed=None,
-        ).values("pulp_created")[:1]
-        content_query = content_query.annotate(repo_added_time=Subquery(repo_added_subquery))
+        content_query = content_query.annotate(
+            active_membership=FilteredRelation(
+                "version_memberships",
+                condition=Q(
+                    version_memberships__repository=repository_version.repository,
+                    version_memberships__version_removed=None,
+                ),
+            ),
+            repo_added_time=F("active_membership__pulp_created"),
+        )
     full_metadata = {"last_serial": 0}  # For now the serial field isn't supported by Pulp
     latest_content = latest_content_version(content_query, version)
     if not latest_content:

pulp_python/app/viewsets.py

@@ -260,7 +260,7 @@ class PythonBlocklistEntryViewSet(
     parent_lookup_kwargs = {"repository_pk": "repository__pk"}
     serializer_class = python_serializers.PythonBlocklistEntrySerializer
     queryset = python_models.PythonBlocklistEntry.objects.all()
-    filterset_fields = {"name": ["exact"], "version": ["exact"], "filename": ["exact"]}
+    filterset_fields = {"name": ["exact"], "version": ["exact", "isnull"], "filename": ["exact"]}
     ordering = ("-pulp_created",)
 
     DEFAULT_ACCESS_POLICY = {

pulp_python/tests/functional/api/test_domains.py

@@ -174,7 +174,10 @@ def test_domain_content_replication(
         pulpcore_bindings.UpstreamPulpsApi, upstream_pulp_body, pulp_domain=replica_domain.name
     )
     # Run the replicate task and assert that all tasks successfully complete.
-    response = pulpcore_bindings.UpstreamPulpsApi.replicate(upstream_pulp.pulp_href)
+    response = pulpcore_bindings.UpstreamPulpsApi.replicate(
+        upstream_pulp.pulp_href,
+        upstream_pulp_replicate=pulpcore_bindings.module.UpstreamPulpReplicate(),
+    )
     monitor_task_group(response.task_group)
 
     counts = {}
@@ -198,7 +201,10 @@ def test_domain_content_replication(
     body = {"remote": remote.pulp_href}
     monitor_task(python_bindings.RepositoriesPythonApi.sync(repo.pulp_href, body).task)
 
-    response = pulpcore_bindings.UpstreamPulpsApi.replicate(upstream_pulp.pulp_href)
+    response = pulpcore_bindings.UpstreamPulpsApi.replicate(
+        upstream_pulp.pulp_href,
+        upstream_pulp_replicate=pulpcore_bindings.module.UpstreamPulpReplicate(),
+    )
     monitor_task_group(response.task_group)
 
     response = python_bindings.ContentPackagesApi.list(pulp_domain=replica_domain.name)

{pulp_python-3.30.1.dist-info → pulp_python-3.30.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.30.1
+Version: 3.30.3
 Summary: pulp-python plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_python-3.30.1.dist-info → pulp_python-3.30.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_python/__init__.py,sha256=GIuTLoBTc-07dSLJUh8xrZPRz8x-jJ61pfR0J1IjnzI,65
 pulp_python/pytest_plugin.py,sha256=LNnLjOkeEu2X4gJi614bHVmbsHyEwooHYIeecr96Qy4,8606
-pulp_python/app/__init__.py,sha256=kvIZAie_YepDZxtZCUo9YVSjAZXhIjWL7sq7aSI88L8,2490
+pulp_python/app/__init__.py,sha256=VKkMV6VGzjAXuAn4JdLyxxMWYfMBI9VZcsviliiedEU,2490
 pulp_python/app/global_access_conditions.py,sha256=MZJtyoVsr-4hRaty6mKDqh3caOHd5UKJjEWLV2crOLs,1080
 pulp_python/app/modelresource.py,sha256=4SFAdqk6lozi_cZz4uqDIqhqPAZF-7l5jJwPn-xGZFs,1249
 pulp_python/app/models.py,sha256=Y7MDTl2nKz1dz2S4KQIQQ4oWcYgBA4TyDVxJGBYPHY4,17705
@@ -9,8 +9,8 @@ pulp_python/app/replica.py,sha256=qiWRP7tM_v4yP_XLIQfumfGolru-Jt6ZA0KVb-9g2cA,18
 pulp_python/app/serializers.py,sha256=Wg83g7LE9Qkf1S7hkkvG2_EJUi7D12l8UyCA1wmwf-I,33819
 pulp_python/app/settings.py,sha256=Cyc_p6U0HQjKpyrRL6JFrK3R7RMQJ9MAgNMJCfzPEiA,255
 pulp_python/app/urls.py,sha256=M2xjQ0j47BwQVpi75QCa5eUnQDcroKv3Cee7UrQ3QcA,1387
-pulp_python/app/utils.py,sha256=f9sCzZ58Sf7EBNqzBG0NBGtWE6gE2eIcnoSTAhdVIIg,27303
-pulp_python/app/viewsets.py,sha256=EyeuNNvklB74tSyL4MRfTnh4a5KVv2kUPgmeTUd6oSY,34209
+pulp_python/app/utils.py,sha256=aFBd0llndGiBb6VlvoOvGkD3G3ciWyQierykpqxue_8,27386
+pulp_python/app/viewsets.py,sha256=yN1gHaT9vosqTbEP6emyMzoitliTzeHZTEqBVyn_2vA,34219
 pulp_python/app/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/management/commands/repair-python-metadata.py,sha256=knvTPcPwyfgCH0-KNNCK1Mj0mQKzXUdYEwo-v6F94XU,4548
@@ -40,7 +40,7 @@ pulp_python/app/migrations/0022_pythonblocklistentry.py,sha256=EbtjZuN65myTAHVWr
 pulp_python/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/pypi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/pypi/serializers.py,sha256=rE0Cci2IMg4NbNWlVdo-8zPaJCAUq2Re57q_T3jMt0Y,5030
-pulp_python/app/pypi/views.py,sha256=D2lsHijKp3ZJemt-iwWxjJEin5rAkc0pZzi9kZyQgwk,21651
+pulp_python/app/pypi/views.py,sha256=F55Zp4GPAQDVk936Szu2ECge8p1-5A160iqzrMDTZGc,21668
 pulp_python/app/tasks/__init__.py,sha256=lTFpVvpDKbqv9RC0b2RYU8Bo6svDjrA-djt16pADFr8,284
 pulp_python/app/tasks/publish.py,sha256=bjsJzqJbLu7TF5rLb-UsZMmlNnc_LKw-sdHX9Gcatbw,4334
 pulp_python/app/tasks/repair.py,sha256=5InzdbjW8y3AC4Vj2PsNLm3wGGTr8D3LcfPw_WA2Fks,12257
@@ -62,7 +62,7 @@ pulp_python/tests/functional/api/test_consume_content.py,sha256=-7b6KOrIT3NLSUaf
 pulp_python/tests/functional/api/test_crud_content_unit.py,sha256=R5Gvl4ZjW1eQHmrbqsR0zfzKANBxEKwlr_lugHir7Kk,13794
 pulp_python/tests/functional/api/test_crud_publications.py,sha256=3cuSDC9C9M1opt0lh5ObGj8t7gq5jUW-RWj6MrA4Teo,5647
 pulp_python/tests/functional/api/test_crud_remotes.py,sha256=clFFhgG5udyKzWOLwxpmwjhiVz8r5JEPAQHkztcAf9w,5812
-pulp_python/tests/functional/api/test_domains.py,sha256=BnWBwid_RA0xenBBHwvkT5_23RPe19DjQCICdMWad3w,10227
+pulp_python/tests/functional/api/test_domains.py,sha256=uEA7dIBXaXah3WQ6g6xSIjdXOR_hrsQnSFrfbdtz8bg,10421
 pulp_python/tests/functional/api/test_download_content.py,sha256=5IuaHXyLakPkjm5sLTxtTl7Dq0yl7N36HpObnIa0Sks,4950
 pulp_python/tests/functional/api/test_export_import.py,sha256=rHns9wdaeP-vtfW_qoGHU9EVuJ4YuWE0-rjl_8otAgU,4530
 pulp_python/tests/functional/api/test_full_mirror.py,sha256=eU5HzgBBFOnX1q4m8ELx-t-I3U4TWXL-LNrlc2BcWVc,12045
@@ -77,9 +77,9 @@ pulp_python/tests/functional/assets/shelf-reader-0.1.tar.gz.publish.attestation,
 pulp_python/tests/functional/assets/shelf_reader-0.1-py2-none-any.whl.publish.attestation,sha256=muTQ8dqYSSdx76DlaPjB1REcNIS-aak-Na0TkASxu8M,10426
 pulp_python/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/tests/unit/test_models.py,sha256=TBI0yKsrdbnJSPeBFfxSqhXK7zaNvR6qg5JehGH3Pds,229
-pulp_python-3.30.1.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_python-3.30.1.dist-info/METADATA,sha256=BcaJBgi3HQekc7OK4Ub3IBxMf5q42FQJDfnfRvQbevY,1744
-pulp_python-3.30.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pulp_python-3.30.1.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
-pulp_python-3.30.1.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
-pulp_python-3.30.1.dist-info/RECORD,,
+pulp_python-3.30.3.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_python-3.30.3.dist-info/METADATA,sha256=O3QRZ0GzgXIs45OgII_NKjTkSFVYoo3xmEP3xE_hazc,1744
+pulp_python-3.30.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pulp_python-3.30.3.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
+pulp_python-3.30.3.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
+pulp_python-3.30.3.dist-info/RECORD,,