temp

dralley · dralley · commit 2ca18dab4a1a · 2025-11-03T09:13:02.000-05:00
diff --git a/pulp_python/app/migrations/0016_pythonpackagecontent_sha256_metadata_and_more.py b/pulp_python/app/migrations/0016_pythonpackagecontent_sha256_metadata_and_more.py
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name="pythonpackagecontent",
-            name="sha256_metadata",
-            field=models.CharField(default="", max_length=64),
+            name="metadata_sha256",
+            field=models.CharField(null=True, max_length=64),
             preserve_default=False,
         ),
         migrations.AddField(
diff --git a/pulp_python/app/models.py b/pulp_python/app/models.py
@@ -192,7 +192,7 @@ class PythonPackageContent(Content):
     packagetype = models.TextField(choices=PACKAGE_TYPES)
     python_version = models.TextField()
     sha256 = models.CharField(db_index=True, max_length=64)
-    sha256_metadata = models.CharField(max_length=64)
+    metadata_sha256 = models.CharField(max_length=64, null=True)
     yanked = models.BooleanField(default=False)
     yanked_reason = models.TextField()
 
diff --git a/pulp_python/app/pypi/views.py b/pulp_python/app/pypi/views.py
@@ -342,7 +342,7 @@ def retrieve(self, request, path, package):
                 "filename",
                 "sha256",
                 "name",
-                "sha256_metadata",
+                "metadata_sha256",
                 "requires_python",
                 "yanked",
                 "yanked_reason",
@@ -361,7 +361,7 @@ def retrieve(self, request, path, package):
                 "filename": f,
                 "url": urljoin(self.base_content_url, f"{path}/{f}"),
                 "sha256": s,
-                "sha256_metadata": sm,
+                "metadata_sha256": sm,
                 "requires_python": rp,
                 "yanked": y,
                 "yanked_reason": yr,
diff --git a/pulp_python/app/tasks/publish.py b/pulp_python/app/tasks/publish.py
@@ -118,7 +118,6 @@ def write_project_page(name, simple_dir, package_releases, publication):
     metadata_relative_path = f"{project_dir}index.html"
 
     with open(metadata_relative_path, "w") as simple_metadata:
-        # todo?
         simple_metadata.write(write_simple_detail(name, package_releases))
 
     project_metadata = models.PublishedMetadata.create_from_file(
diff --git a/pulp_python/app/utils.py b/pulp_python/app/utils.py
@@ -12,18 +12,17 @@
 from pulpcore.plugin.models import Remote
 
 
-# todo: why upper case?
 PYPI_LAST_SERIAL = "X-PYPI-LAST-SERIAL"
 """TODO This serial constant is temporary until Python repositories implements serials"""
 PYPI_SERIAL_CONSTANT = 1000000000
 
-PYPI_API_VERSION = "1.0"
+SIMPLE_API_VERSION = "1.0"
 
 simple_index_template = """<!DOCTYPE html>
 <html>
   <head>
     <title>Simple Index</title>
-    <meta name="api-version" value="2" />
+    <meta name="pypi:repository-version" content="{SIMPLE_API_VERSION}">
   </head>
   <body>
     {% for name, canonical_name in projects %}
@@ -37,12 +36,12 @@
 <html>
 <head>
   <title>Links for {{ project_name }}</title>
-  <meta name="api-version" value="2" />
+  <meta name="pypi:repository-version" content="{SIMPLE_API_VERSION}">
 </head>
 <body>
     <h1>Links for {{ project_name }}</h1>
     {% for pkg in project_packages %}
-    <a href="{{ pkg.url }}#sha256={{ pkg.sha256 }}" rel="internal">{{ pkg.filename }}</a><br/>
+    <a href="{{ pkg.url }}#sha256={{ pkg.sha256 }}" rel="internal">{{ pkg.filename }}{% if pkg.yanked %}data-yanked="{{ pkg.yanked_reason }}"{% endif %}</a><br/>
     {% endfor %}
 </body>
 </html>
@@ -131,6 +130,9 @@ def parse_project_metadata(project):
         # Release metadata
         "packagetype": project.get("packagetype") or "",
         "python_version": project.get("python_version") or "",
+        "yanked": False,
+        "yanked_reason": "",
+        "metadata_sha256": "",  # TODO
     }
 
 
@@ -163,7 +165,7 @@ def parse_metadata(project, version, distribution):
     )  # noqa: E501
     package["yanked"] = distribution.get("yanked") or False
     package["yanked_reason"] = distribution.get("yanked_reason") or ""
-    package["sha256_metadata"] = distribution.get("data-dist-info-metadata", {}).get("sha256") or ""
+    package["metadata_sha256"] = distribution.get("data-dist-info-metadata", {}).get("sha256") or ""
 
     return package
 
@@ -209,10 +211,6 @@ def artifact_to_python_content_data(filename, artifact, domain=None):
     data["filename"] = filename
     data["pulp_domain"] = domain or artifact.pulp_domain
     data["_pulp_domain"] = data["pulp_domain"]
-    # todo: how to get these / should they be here?
-    # data["yanked"] = False
-    # data["yanked_reason"] = ""
-    # data["sha256_metadata"] = ""
     return data
 
 
@@ -335,7 +333,6 @@ def python_content_to_info(content):
         "platform": content.platform or "",
         "requires_dist": json_to_dict(content.requires_dist) or None,
         "classifiers": json_to_dict(content.classifiers) or None,
-        # todo yanked
         "yanked": False,  # These are no longer used on PyPI, but are still present
         "yanked_reason": None,
         # New core metadata (Version 2.1, 2.2, 2.4)
@@ -429,7 +426,7 @@ def write_simple_detail(project_name, project_packages, streamed=False):
 def write_simple_index_json(project_names):
     """Writes the simple index in JSON format."""
     return {
-        "meta": {"api-version": PYPI_API_VERSION, "_last-serial": PYPI_SERIAL_CONSTANT},
+        "meta": {"api-version": SIMPLE_API_VERSION, "_last-serial": PYPI_SERIAL_CONSTANT},
         "projects": [
             {"name": name, "_last-serial": PYPI_SERIAL_CONSTANT} for name in project_names
         ],
@@ -439,7 +436,7 @@ def write_simple_index_json(project_names):
 def write_simple_detail_json(project_name, project_packages):
     """Writes the simple detail page in JSON format."""
     return {
-        "meta": {"api-version": PYPI_API_VERSION, "_last-serial": PYPI_SERIAL_CONSTANT},
+        "meta": {"api-version": SIMPLE_API_VERSION, "_last-serial": PYPI_SERIAL_CONSTANT},
         "name": canonicalize_name(project_name),
         "files": [
             {
@@ -450,23 +447,21 @@ def write_simple_detail_json(project_name, project_packages):
                 "requires_python": package["requires_python"] or None,
                 # data-dist-info-metadata is deprecated alias for core-metadata
                 "data-dist-info-metadata": (
-                    {"sha256": package["sha256_metadata"]} if package["sha256_metadata"] else False
+                    {"sha256": package["metadata_sha256"]} if package["metadata_sha256"] else False
                 ),
                 "yanked": (
                     package["yanked_reason"]
                     if package["yanked"] and package["yanked_reason"]
                     else package["yanked"]
                 ),
-                # gpg-sig (not in warehouse)
-                # todo (from new PEPs):
-                # size (v1.1, PEP 700)
-                # upload-time (v1.1, PEP 700)
-                # core-metadata (PEP 7.14)
-                # provenance (v1.3, PEP 740)
+                # TODO:
+                # size, upload-time (v1.1, PEP 700)
+                # core-metadata (PEP 714)
+                # provenance and digital attestation (v1.3, PEP 740)
             }
             for package in project_packages
         ],
-        # todo (from new PEPs):
+        # TODO:
         # versions (v1.1, PEP 700)
         # alternate-locations (v1.2, PEP 708)
         # project-status (v1.4, PEP 792 - pypi and docs differ)
