Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pulp_python/app/pypi/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from pathlib import PurePath
from urllib.parse import urljoin, urlparse, urlunsplit

import packaging_legacy.version
from django.contrib.sessions.models import Session
from django.core.exceptions import ObjectDoesNotExist
from django.db import transaction
Expand Down Expand Up @@ -404,14 +405,18 @@ def retrieve(self, request, path, package):
if not releases:
return HttpResponseNotFound(f"{normalized} does not exist.")

sorted_releases = sorted(
releases.values(),
key=lambda r: (packaging_legacy.version.parse(r["version"]), r["filename"]),
)
media_type = request.accepted_renderer.media_type
headers = {"X-PyPI-Last-Serial": str(PYPI_SERIAL_CONSTANT)}

if media_type == PYPI_SIMPLE_V1_JSON:
detail_data = write_simple_detail_json(normalized, releases.values())
detail_data = write_simple_detail_json(normalized, sorted_releases)
return Response(detail_data, headers=headers)
else:
detail_data = write_simple_detail(normalized, releases.values())
detail_data = write_simple_detail(normalized, sorted_releases)
kwargs = {"content_type": media_type, "headers": headers}
return HttpResponse(detail_data, **kwargs)

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies = [
"bandersnatch>=6.6.0,<6.7",
"pypi-simple>=1.8.0,<2.0",
"pypi-attestations==0.0.28", # API is not stable
"packaging-legacy>=23.0,<24",
]

[project.urls]
Expand Down
Loading