Implement PEP 714 (#13706)

ewdurbin · web-flow · commit 38ba926d2083 · 2023-06-27T14:05:02.000-04:00
* 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
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>

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,7 @@ def test_with_files_no_serial(self, db_request, content_type, renderer_override)`
`272`	`272`	`"size": f.size,`
`273`	`273`	`"upload-time": f.upload_time.isoformat() + "Z",`
`274`	`274`	`"data-dist-info-metadata": False,`
	`275`	`+ "core-metadata": False,`
`275`	`276`	`}`
`276`	`277`	`for f in files`
`277`	`278`	`],`
`@@ -319,6 +320,7 @@ def test_with_files_with_serial(self, db_request, content_type, renderer_overrid`
`319`	`320`	`"size": f.size,`
`320`	`321`	`"upload-time": f.upload_time.isoformat() + "Z",`
`321`	`322`	`"data-dist-info-metadata": False,`
	`323`	`+ "core-metadata": False,`
`322`	`324`	`}`
`323`	`325`	`for f in files`
`324`	`326`	`],`
`@@ -407,6 +409,9 @@ def test_with_files_with_version_multi_digit(`
`407`	`409`	`}`
`408`	`410`	`if f.metadata_file_sha256_digest is not None`
`409`	`411`	`else False,`
	`412`	`+ "core-metadata": {"sha256": "deadbeefdeadbeefdeadbeefdeadbeef"}`
	`413`	`+ if f.metadata_file_sha256_digest is not None`
	`414`	`+ else False,`
`410`	`415`	`}`
`411`	`416`	`for f in files`
`412`	`417`	`],`