Skip to content

Sort Simple API detail page releases #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jobselko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sort Simple API detail page releases #1272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions pulp_python/app/pypi/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from drf_spectacular.utils import extend_schema
from dynaconf import settings
from packaging.utils import canonicalize_name
from packaging.version import Version
from rest_framework.exceptions import NotAcceptable
from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer, TemplateHTMLRenderer
from rest_framework.response import Response
Expand Down Expand Up @@ -404,14 +405,17 @@ def retrieve(self, request, path, package):
if not releases:
return HttpResponseNotFound(f"{normalized} does not exist.")

sorted_releases = sorted(
releases.values(), key=lambda r: (Version(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