Implement PEP 714 (#13706)

* correct key for pep 658 metadata in JSON Simple API * nah, implement PEP714 (provisionally of course) * reference the new canonical key for pep 714 and 658bug implementations
pypi · Jun 27, 2023 · 38ba926 · 38ba926
1 parent fec156f
commit 38ba926
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/tests/unit/api/test_simple.py b/tests/unit/api/test_simple.py
@@ -272,6 +272,7 @@ def test_with_files_no_serial(self, db_request, content_type, renderer_override)
                     "size": f.size,
                     "upload-time": f.upload_time.isoformat() + "Z",
                     "data-dist-info-metadata": False,
+                    "core-metadata": False,
                 }
                 for f in files
             ],
@@ -319,6 +320,7 @@ def test_with_files_with_serial(self, db_request, content_type, renderer_overrid
                     "size": f.size,
                     "upload-time": f.upload_time.isoformat() + "Z",
                     "data-dist-info-metadata": False,
+                    "core-metadata": False,
                 }
                 for f in files
             ],
@@ -407,6 +409,9 @@ def test_with_files_with_version_multi_digit(
                     }
                     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,
                 }
                 for f in files
             ],

diff --git a/warehouse/packaging/utils.py b/warehouse/packaging/utils.py
@@ -73,6 +73,9 @@ def _simple_detail(project, request):
                 "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,
             }
             for file in files
         ],

diff --git a/warehouse/templates/api/simple/detail.html b/warehouse/templates/api/simple/detail.html
@@ -20,7 +20,7 @@
   <body>
     <h1>Links for {{ name }}</h1>
     {% for file in files -%}
-    <a href="{{ file.url }}#sha256={{ file.hashes.sha256 }}" {% if file.get('requires-python') %}data-requires-python="{{ file['requires-python'] }}" {% endif %}{% if file.yanked %}data-yanked="{% if file.yanked is string %}{{ file.yanked }}{% endif %}" {% endif %}{% if file['data-dist-info-metadata'] %}data-dist-info-metadata="sha256={{ file['data-dist-info-metadata']['sha256'] }}"{% endif %}>{{ file.filename }}</a><br />
+    <a href="{{ file.url }}#sha256={{ file.hashes.sha256 }}" {% if file.get('requires-python') %}data-requires-python="{{ file['requires-python'] }}" {% endif %}{% if file.yanked %}data-yanked="{% if file.yanked is string %}{{ file.yanked }}{% endif %}" {% endif %}{% if file['core-metadata'] %}data-dist-info-metadata="sha256={{ file['core-metadata']['sha256'] }}" data-core-metadata="sha256={{ file['core-metadata']['sha256'] }}"{% endif %}>{{ file.filename }}</a><br />
     {% endfor -%}
   </body>
 </html>