From cc46ceaa6feb462c523f98ecc82c322f444a5f3d Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Sun, 21 May 2023 08:12:07 -0400 Subject: [PATCH 1/3] correct key for pep 658 metadata in JSON Simple API --- tests/unit/api/test_simple.py | 8 +++----- warehouse/packaging/utils.py | 2 +- warehouse/templates/api/simple/detail.html | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/unit/api/test_simple.py b/tests/unit/api/test_simple.py index d2bc938de493..5623d72b2c5f 100644 --- a/tests/unit/api/test_simple.py +++ b/tests/unit/api/test_simple.py @@ -271,7 +271,7 @@ def test_with_files_no_serial(self, db_request, content_type, renderer_override) "yanked": False, "size": f.size, "upload-time": f.upload_time.isoformat() + "Z", - "data-dist-info-metadata": False, + "dist-info-metadata": False, } for f in files ], @@ -318,7 +318,7 @@ def test_with_files_with_serial(self, db_request, content_type, renderer_overrid "yanked": False, "size": f.size, "upload-time": f.upload_time.isoformat() + "Z", - "data-dist-info-metadata": False, + "dist-info-metadata": False, } for f in files ], @@ -402,9 +402,7 @@ def test_with_files_with_version_multi_digit( "yanked": False, "size": f.size, "upload-time": f.upload_time.isoformat() + "Z", - "data-dist-info-metadata": { - "sha256": "deadbeefdeadbeefdeadbeefdeadbeef" - } + "dist-info-metadata": {"sha256": "deadbeefdeadbeefdeadbeefdeadbeef"} if f.metadata_file_sha256_digest is not None else False, } diff --git a/warehouse/packaging/utils.py b/warehouse/packaging/utils.py index 5fb612b4833b..bbaddafd56f8 100644 --- a/warehouse/packaging/utils.py +++ b/warehouse/packaging/utils.py @@ -70,7 +70,7 @@ def _simple_detail(project, request): "yanked": file.release.yanked_reason if file.release.yanked and file.release.yanked_reason else file.release.yanked, - "data-dist-info-metadata": {"sha256": file.metadata_file_sha256_digest} + "dist-info-metadata": {"sha256": file.metadata_file_sha256_digest} if file.metadata_file_sha256_digest else False, } diff --git a/warehouse/templates/api/simple/detail.html b/warehouse/templates/api/simple/detail.html index 17ed4c1c62ad..a2b7e79fc011 100644 --- a/warehouse/templates/api/simple/detail.html +++ b/warehouse/templates/api/simple/detail.html @@ -20,7 +20,7 @@

Links for {{ name }}

{% for file in files -%} - {{ file.filename }}
+ {{ file.filename }}
{% endfor -%} From 357916f3a894a871d153935a08d3e1e1c923ec86 Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Tue, 6 Jun 2023 21:29:52 -0400 Subject: [PATCH 2/3] nah, implement PEP714 (provisionally of course) --- tests/unit/api/test_simple.py | 13 ++++++++++--- warehouse/packaging/utils.py | 5 ++++- warehouse/templates/api/simple/detail.html | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/unit/api/test_simple.py b/tests/unit/api/test_simple.py index 5623d72b2c5f..685b3f05ba82 100644 --- a/tests/unit/api/test_simple.py +++ b/tests/unit/api/test_simple.py @@ -271,7 +271,8 @@ def test_with_files_no_serial(self, db_request, content_type, renderer_override) "yanked": False, "size": f.size, "upload-time": f.upload_time.isoformat() + "Z", - "dist-info-metadata": False, + "data-dist-info-metadata": False, + "core-metadata": False, } for f in files ], @@ -318,7 +319,8 @@ def test_with_files_with_serial(self, db_request, content_type, renderer_overrid "yanked": False, "size": f.size, "upload-time": f.upload_time.isoformat() + "Z", - "dist-info-metadata": False, + "data-dist-info-metadata": False, + "core-metadata": False, } for f in files ], @@ -402,7 +404,12 @@ def test_with_files_with_version_multi_digit( "yanked": False, "size": f.size, "upload-time": f.upload_time.isoformat() + "Z", - "dist-info-metadata": {"sha256": "deadbeefdeadbeefdeadbeefdeadbeef"} + "data-dist-info-metadata": { + "sha256": "deadbeefdeadbeefdeadbeefdeadbeef" + } + if f.metadata_file_sha256_digest is not None + else False, + "core-metadata": {"sha256": "deadbeefdeadbeefdeadbeefdeadbeef"} if f.metadata_file_sha256_digest is not None else False, } diff --git a/warehouse/packaging/utils.py b/warehouse/packaging/utils.py index bbaddafd56f8..496f6704419d 100644 --- a/warehouse/packaging/utils.py +++ b/warehouse/packaging/utils.py @@ -70,7 +70,10 @@ def _simple_detail(project, request): "yanked": file.release.yanked_reason if file.release.yanked and file.release.yanked_reason else file.release.yanked, - "dist-info-metadata": {"sha256": file.metadata_file_sha256_digest} + "data-dist-info-metadata": {"sha256": file.metadata_file_sha256_digest} + if file.metadata_file_sha256_digest + else False, + "core-metadata": {"sha256": file.metadata_file_sha256_digest} if file.metadata_file_sha256_digest else False, } diff --git a/warehouse/templates/api/simple/detail.html b/warehouse/templates/api/simple/detail.html index a2b7e79fc011..3f5b592e559e 100644 --- a/warehouse/templates/api/simple/detail.html +++ b/warehouse/templates/api/simple/detail.html @@ -20,7 +20,7 @@

Links for {{ name }}

{% for file in files -%} - {{ file.filename }}
+ {{ file.filename }}
{% endfor -%} From 9de3b7b2b76b4d480144de0b0604781ab025655d Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Tue, 6 Jun 2023 22:31:27 -0400 Subject: [PATCH 3/3] reference the new canonical key for pep 714 and 658bug implementations --- warehouse/templates/api/simple/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warehouse/templates/api/simple/detail.html b/warehouse/templates/api/simple/detail.html index 3f5b592e559e..24b0042c5863 100644 --- a/warehouse/templates/api/simple/detail.html +++ b/warehouse/templates/api/simple/detail.html @@ -20,7 +20,7 @@

Links for {{ name }}

{% for file in files -%} - {{ file.filename }}
+ {{ file.filename }}
{% endfor -%}