pulp-python 3.29.0__tar.gz → 3.30.1__tar.gz

{pulp_python-3.29.0 → pulp_python-3.30.1}/CHANGES.md

@@ -8,6 +8,29 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.30.1 (2026-05-19) {: #3.30.1 }
+
+#### Bugfixes {: #3.30.1-bugfix }
+
+- Fixed `upload_time` in Simple and JSON APIs to reflect repository addition time instead of content creation time.
+  [#1232](https://github.com/pulp/pulp_python/issues/1232)
+
+---
+
+## 3.30.0 (2026-05-13) {: #3.30.0 }
+
+#### Features {: #3.30.0-feature }
+
+- Added filtering by `name`, `version`, and `filename` to the blocklist entries API endpoint.
+  [#1229](https://github.com/pulp/pulp_python/issues/1229)
+
+#### Deprecations and Removals {: #3.30.0-removal }
+
+- Deprecated the `repair-python-metadata` management command in favor of the repository `repair_metadata` task.
+  [#1207](https://github.com/pulp/pulp_python/issues/1207)
+
+---
+
 ## 3.29.0 (2026-04-17) {: #3.29.0 }
 
 #### Features {: #3.29.0-feature }
@@ -275,6 +298,23 @@
 
 ---
 
+## 3.19.3 (2026-05-04) {: #3.19.3 }
+
+#### Bugfixes {: #3.19.3-bugfix }
+
+- Fixed pull-through caching not checking the repository if package was not present on remote.
+  [#1004](https://github.com/pulp/pulp_python/issues/1004)
+- Fixed pull-through caching failing for packages with bad names.
+  [#1040](https://github.com/pulp/pulp_python/issues/1040)
+
+---
+
+## 3.19.2 (2026-04-28) {: #3.19.2 }
+
+No significant changes.
+
+---
+
 ## 3.19.1 (2025-09-14) {: #3.19.1 }
 
 #### Bugfixes {: #3.19.1-bugfix }
@@ -555,6 +595,12 @@ No significant changes.
 
 ---
 
+## 3.11.8 (2026-04-21) {: #3.11.8 }
+
+No significant changes.
+
+---
+
 ## 3.11.7 (2025-11-18) {: #3.11.7 }
 
 No significant changes.

{pulp_python-3.29.0 → pulp_python-3.30.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.29.0
+Version: 3.30.1
 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.29.0 → pulp_python-3.30.1}/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.29.0"
+    version = "3.30.1"
     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-3.29.0 → pulp_python-3.30.1}/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
 
@@ -78,7 +79,10 @@ class Command(BaseCommand):
     Management command to repair metadata of PythonPackageContent.
     """
 
-    help = _("Repair the metadata of PythonPackageContent stored in PythonRepositories")
+    help = _(
+        "[Deprecated] Use the repository `repair_metadata` task instead. "
+        "Repair the metadata of PythonPackageContent stored in PythonRepositories."
+    )
 
     def add_arguments(self, parser):
         """Set up arguments."""

{pulp_python-3.29.0 → pulp_python-3.30.1}/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-3.29.0 → pulp_python-3.30.1}/pulp_python/app/models.py

@@ -1,44 +1,45 @@
 import hashlib
 import json
 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 django_lifecycle import (
     BEFORE_SAVE,
     hook,
 )
 from rest_framework.serializers import ValidationError
+
 from pulpcore.plugin.models import (
     AutoAddObjPermsMixin,
     BaseModel,
     Content,
-    Publication,
     Distribution,
+    Publication,
     Remote,
     Repository,
 )
+from pulpcore.plugin.repo_version_utils import (
+    collect_duplicates,
+    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 .provenance import Provenance
 from .utils import (
-    artifact_to_python_content_data,
+    PYPI_LAST_SERIAL,
+    PYPI_SERIAL_CONSTANT,
     artifact_to_metadata_artifact,
+    artifact_to_python_content_data,
     canonicalize_name,
     python_content_to_json,
-    PYPI_LAST_SERIAL,
-    PYPI_SERIAL_CONSTANT,
-)
-from pulpcore.plugin.repo_version_utils import (
-    collect_duplicates,
-    remove_duplicates,
-    validate_repo_version,
 )
-from pulpcore.plugin.util import get_domain_pk, get_domain
 
 log = getLogger(__name__)
 
@@ -453,8 +454,9 @@ class PythonRepository(Repository, AutoAddObjPermsMixin):
                         break
         if blocked:
             raise ValidationError(
-                "Blocklisted packages cannot be added to this repository: "
-                "{}".format(", ".join(blocked))
+                "Blocklisted packages cannot be added to this repository: {}".format(
+                    ", ".join(blocked)
+                )
             )
 
 

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/pypi/serializers.py

@@ -1,13 +1,15 @@
 import logging
 from gettext import gettext as _
 
-from rest_framework import serializers
+from django.db.utils import IntegrityError
 from pydantic import TypeAdapter, ValidationError
-from pulp_python.app.provenance import Attestation
-from pulp_python.app.utils import DIST_EXTENSIONS, SUPPORTED_METADATA_VERSIONS
+from rest_framework import serializers
+
 from pulpcore.plugin.models import Artifact
 from pulpcore.plugin.util import get_domain
-from django.db.utils import IntegrityError
+
+from pulp_python.app.provenance import Attestation
+from pulp_python.app.utils import DIST_EXTENSIONS, SUPPORTED_METADATA_VERSIONS
 
 log = logging.getLogger(__name__)
 
@@ -110,7 +112,7 @@ class PackageUploadSerializer(serializers.Serializer):
                 attestations = TypeAdapter(list[Attestation]).validate_python(attestations)
             except ValidationError as e:
                 raise serializers.ValidationError(
-                    {"attestations": _("The uploaded attestations are not valid: {}".format(e))}
+                    {"attestations": _("The uploaded attestations are not valid: {}").format(e)}
                 )
 
         sha256 = data.get("sha256_digest")

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/pypi/views.py

@@ -1,60 +1,61 @@
 import logging
-
-from rest_framework.viewsets import ViewSet
-from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer, TemplateHTMLRenderer
-from rest_framework.response import Response
-from rest_framework.exceptions import NotAcceptable
-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 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.utils import DatabaseError
 from django.http.response import (
     Http404,
-    HttpResponseNotFound,
-    HttpResponseForbidden,
+    HttpResponse,
     HttpResponseBadRequest,
+    HttpResponseForbidden,
+    HttpResponseNotFound,
     StreamingHttpResponse,
-    HttpResponse,
 )
+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 rest_framework.exceptions import NotAcceptable
+from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer, TemplateHTMLRenderer
+from rest_framework.response import Response
+from rest_framework.viewsets import ViewSet
 
-from pulpcore.plugin.viewsets import OperationPostponedResponse
+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
+
+from pulp_python.app import tasks
 from pulp_python.app.models import (
+    PackageProvenance,
     PythonDistribution,
     PythonPackageContent,
     PythonPublication,
-    PackageProvenance,
 )
 from pulp_python.app.pypi.serializers import (
-    SummarySerializer,
     PackageMetadataSerializer,
     PackageUploadSerializer,
     PackageUploadTaskSerializer,
+    SummarySerializer,
 )
 from pulp_python.app.utils import (
-    write_simple_index,
-    write_simple_index_json,
-    write_simple_detail,
-    write_simple_detail_json,
-    python_content_to_json,
     PYPI_LAST_SERIAL,
     PYPI_SERIAL_CONSTANT,
     get_remote_package_filter,
     get_remote_simple_page,
+    python_content_to_json,
+    write_simple_detail,
+    write_simple_detail_json,
+    write_simple_index,
+    write_simple_index_json,
 )
 
-from pulp_python.app import tasks
-
 log = logging.getLogger(__name__)
 
 ORIGIN_HOST = settings.CONTENT_ORIGIN if settings.CONTENT_ORIGIN else settings.PYPI_API_HOSTNAME
@@ -367,13 +368,20 @@ 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)
-            packages = local_packages.values(
+            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)
+            ).values(
                 "filename",
                 "sha256",
                 "metadata_sha256",
                 "requires_python",
                 "size",
-                "pulp_created",
+                "repo_added_time",
                 "version",
             )
             provenances = PackageProvenance.objects.filter(package__in=local_packages).values_list(
@@ -383,7 +391,7 @@ class SimpleView(PackageUploadMixin, ViewSet):
                 p["filename"]: {
                     **p,
                     "url": urljoin(self.base_content_url, f"{path}/{p['filename']}"),
-                    "upload_time": p["pulp_created"],
+                    "upload_time": p["repo_added_time"],
                     "provenance": (
                         self.get_provenance_url(normalized, p["version"], p["filename"])
                         if p["filename"] in provenances
@@ -465,7 +473,11 @@ class MetadataView(PyPIMixin, ViewSet):
             if settings.DOMAIN_ENABLED:
                 domain = get_domain()
             json_body = python_content_to_json(
-                path, package_content, version=version, domain=domain
+                path,
+                package_content,
+                version=version,
+                domain=domain,
+                repository_version=repo_ver,
             )
             if json_body:
                 return Response(data=json_body, headers=headers)

{pulp_python-3.29.0 → pulp_python-3.30.1}/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
 

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/serializers.py

@@ -2,33 +2,34 @@ import logging
 import os
 import tempfile
 from gettext import gettext as _
+from urllib.parse import urljoin
+
 from django.conf import settings
 from django.db.utils import IntegrityError
 from drf_spectacular.utils import extend_schema_serializer
 from packaging.requirements import Requirement
-from packaging.version import Version, InvalidVersion
-from rest_framework import serializers
-from pypi_attestations import AttestationError
+from packaging.version import InvalidVersion, Version
 from pydantic import TypeAdapter, ValidationError
-from urllib.parse import urljoin
+from pypi_attestations import AttestationError
+from rest_framework import serializers
 
 from pulpcore.plugin import models as core_models
 from pulpcore.plugin import serializers as core_serializers
-from pulpcore.plugin.util import get_domain, get_prn, get_current_authenticated_user, reverse
+from pulpcore.plugin.util import get_current_authenticated_user, get_domain, get_prn, reverse
 
 from pulp_python.app import models as python_models
-from pulp_python.app.utils import canonicalize_name
 from pulp_python.app.provenance import (
+    AnyPublisher,
     Attestation,
+    AttestationBundle,
     Provenance,
     verify_provenance,
-    AttestationBundle,
-    AnyPublisher,
 )
 from pulp_python.app.utils import (
     DIST_EXTENSIONS,
     artifact_to_metadata_artifact,
     artifact_to_python_content_data,
+    canonicalize_name,
     get_project_metadata_from_file,
     parse_project_metadata,
 )
@@ -238,7 +239,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
         required=False,
         allow_blank=True,
         help_text=_(
-            "The maintainer's name at a minimum; " "additional contact information may be provided."
+            "The maintainer's name at a minimum; additional contact information may be provided."
         ),
     )
     maintainer_email = serializers.CharField(
@@ -387,7 +388,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
             else:
                 attestations = TypeAdapter(list[Attestation]).validate_python(value)
         except ValidationError as e:
-            raise serializers.ValidationError(_("Invalid attestations: {}".format(e)))
+            raise serializers.ValidationError(_("Invalid attestations: {}").format(e))
         return attestations
 
     def handle_attestations(self, filename, sha256, attestations, offline=True):
@@ -400,7 +401,7 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
             verify_provenance(filename, sha256, provenance, offline=offline)
         except AttestationError as e:
             raise serializers.ValidationError(
-                {"attestations": _("Attestations failed verification: {}".format(e))}
+                {"attestations": _("Attestations failed verification: {}").format(e)}
             )
         return provenance.model_dump(mode="json")
 
@@ -655,13 +656,13 @@ class PackageProvenanceSerializer(core_serializers.NoArtifactContentUploadSerial
             data["provenance"] = provenance.model_dump(mode="json")
         except ValidationError as e:
             raise serializers.ValidationError(
-                _("The uploaded provenance is not valid: {}".format(e))
+                _("The uploaded provenance is not valid: {}").format(e)
             )
         if data.pop("verify"):
             try:
                 verify_provenance(data["package"].filename, data["package"].sha256, provenance)
             except AttestationError as e:
-                raise serializers.ValidationError(_("Provenance verification failed: {}".format(e)))
+                raise serializers.ValidationError(_("Provenance verification failed: {}").format(e))
         return data
 
     def retrieve(self, validated_data):
@@ -729,7 +730,7 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
     package_types = MultipleChoiceArrayField(
         required=False,
         help_text=_(
-            "The package types to sync for Python content. Leave blank to get every" "package type."
+            "The package types to sync for Python content. Leave blank to get everypackage type."
         ),
         choices=python_models.PACKAGE_TYPES,
         default=list,
@@ -764,7 +765,7 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
                 Requirement(pkg)
             except ValueError as ve:
                 raise serializers.ValidationError(
-                    _("includes specifier {} is invalid. {}".format(pkg, ve))
+                    _("includes specifier {} is invalid. {}").format(pkg, ve)
                 )
         return value
 
@@ -775,7 +776,7 @@ class PythonRemoteSerializer(core_serializers.RemoteSerializer):
                 Requirement(pkg)
             except ValueError as ve:
                 raise serializers.ValidationError(
-                    _("excludes specifier {} is invalid. {}".format(pkg, ve))
+                    _("excludes specifier {} is invalid. {}").format(pkg, ve)
                 )
         return value
 

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/tasks/publish.py

@@ -1,6 +1,6 @@
-from gettext import gettext as _
 import logging
 import os
+from gettext import gettext as _
 
 from django.core.files import File
 from packaging.utils import canonicalize_name
@@ -10,7 +10,7 @@ from pulpcore.plugin.util import get_domain
 
 from pulp_python.app import models as python_models
 from pulp_python.app.serializers import PythonPublicationSerializer
-from pulp_python.app.utils import write_simple_index, write_simple_detail
+from pulp_python.app.utils import write_simple_detail, write_simple_index
 
 log = logging.getLogger(__name__)
 

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/tasks/repair.py

@@ -7,6 +7,10 @@ from uuid import UUID
 
 from django.db.models import Prefetch
 from django.db.models.query import QuerySet
+
+from pulpcore.plugin.models import ContentArtifact, ProgressReport
+from pulpcore.plugin.util import get_domain
+
 from pulp_python.app.models import PythonPackageContent, PythonRepository
 from pulp_python.app.utils import (
     artifact_to_python_content_data,
@@ -16,8 +20,6 @@ from pulp_python.app.utils import (
     metadata_content_to_artifact,
     parse_metadata,
 )
-from pulpcore.plugin.models import ContentArtifact, ProgressReport
-from pulpcore.plugin.util import get_domain
 
 log = logging.getLogger(__name__)
 

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/tasks/sync.py

@@ -1,11 +1,17 @@
-import logging
 import asyncio
-
-from aiohttp import ClientResponseError, ClientError
-from lxml.etree import LxmlError
-from gettext import gettext as _
+import logging
 from functools import partial
+from gettext import gettext as _
+from urllib.parse import urljoin
 
+from aiohttp import ClientError, ClientResponseError
+from bandersnatch.configuration import BandersnatchConfig
+from bandersnatch.master import Master
+from bandersnatch.mirror import Mirror
+from lxml.etree import LxmlError
+from packaging.requirements import Requirement
+from pypi_attestations import Provenance
+from pypi_simple import IndexPage
 from rest_framework import serializers
 
 from pulpcore.plugin.download import HttpDownloader
@@ -18,19 +24,11 @@ from pulpcore.plugin.stages import (
 )
 
 from pulp_python.app.models import (
+    PackageProvenance,
     PythonPackageContent,
     PythonRemote,
-    PackageProvenance,
 )
-from pulp_python.app.utils import parse_metadata, PYPI_LAST_SERIAL, aget_remote_simple_page
-from pypi_simple import IndexPage
-from pypi_attestations import Provenance
-
-from bandersnatch.mirror import Mirror
-from bandersnatch.master import Master
-from bandersnatch.configuration import BandersnatchConfig
-from packaging.requirements import Requirement
-from urllib.parse import urljoin
+from pulp_python.app.utils import PYPI_LAST_SERIAL, aget_remote_simple_page, parse_metadata
 
 logger = logging.getLogger(__name__)
 

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/tasks/upload.py

@@ -1,17 +1,18 @@
 import time
-
 from datetime import datetime, timezone
-from django.db import transaction
+
 from django.contrib.sessions.models import Session
+from django.db import transaction
 from pydantic import TypeAdapter
-from pulpcore.plugin.models import Artifact, CreatedResource, Content, ContentArtifact
-from pulpcore.plugin.util import get_domain, get_current_authenticated_user, get_prn
 
-from pulp_python.app.models import PythonPackageContent, PythonRepository, PackageProvenance
+from pulpcore.plugin.models import Artifact, Content, ContentArtifact, CreatedResource
+from pulpcore.plugin.util import get_current_authenticated_user, get_domain, get_prn
+
+from pulp_python.app.models import PackageProvenance, PythonPackageContent, PythonRepository
 from pulp_python.app.provenance import (
+    AnyPublisher,
     Attestation,
     AttestationBundle,
-    AnyPublisher,
     Provenance,
     verify_provenance,
 )

{pulp_python-3.29.0 → pulp_python-3.30.1}/pulp_python/app/utils.py

@@ -1,23 +1,26 @@
 import hashlib
+import json
 import logging
-import pkginfo
 import re
 import shutil
 import tempfile
 import zipfile
-import json
-from aiohttp.client_exceptions import ClientError
 from collections import defaultdict
 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.utils import IntegrityError
 from jinja2 import Template
-from packaging.utils import canonicalize_name
 from packaging.requirements import Requirement
-from packaging.version import parse, InvalidVersion
+from packaging.utils import canonicalize_name
+from packaging.version import InvalidVersion, parse
 from pypi_simple import ACCEPT_JSON_PREFERRED, ProjectPage
-from pulpcore.plugin.models import Artifact, Remote
+
 from pulpcore.plugin.exceptions import TimeoutException
+from pulpcore.plugin.models import Artifact, Remote, RepositoryContent
 from pulpcore.plugin.util import get_domain
 
 log = logging.getLogger(__name__)
@@ -357,7 +360,9 @@ def fetch_json_release_metadata(name: str, version: str, remotes: set[Remote]) -
         raise Exception(f"Failed to fetch {url} from any remote.")
 
 
-def python_content_to_json(base_path, content_query, version=None, domain=None):
+def python_content_to_json(
+    base_path, content_query, version=None, domain=None, repository_version=None
+):
     """
     Converts a QuerySet of PythonPackageContent into the PyPi JSON format
     https://www.python.org/dev/peps/pep-0566/
@@ -369,6 +374,13 @@ def python_content_to_json(base_path, content_query, version=None, domain=None):
 
     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))
     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:
@@ -513,8 +525,10 @@ def python_content_to_download_info(content, base_path, domain=None):
         "python_version": content.python_version,
         "requires_python": content.requires_python or None,
         "size": content.size,
-        "upload_time": str(content.pulp_created),
-        "upload_time_iso_8601": str(content.pulp_created.isoformat()),
+        "upload_time": str(getattr(content, "repo_added_time", None) or content.pulp_created),
+        "upload_time_iso_8601": str(
+            (getattr(content, "repo_added_time", None) or content.pulp_created).isoformat()
+        ),
         "url": url,
         "yanked": False,
         "yanked_reason": None,