temp

dralley · dralley · commit 9aeaa21427ac · 2025-10-31T12:34:56.000-04: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
@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="pythonpackagecontent",
             name="sha256_metadata",
-            field=models.CharField(default="", max_length=64),
+            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)
+    sha256_metadata = models.CharField(max_length=64, null=True)
     yanked = models.BooleanField(default=False)
     yanked_reason = models.TextField()
 
diff --git a/pulp_python/app/utils.py b/pulp_python/app/utils.py
@@ -17,13 +17,13 @@
 """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,7 +37,7 @@
 <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>
@@ -429,7 +429,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 +439,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": [
             {
@@ -457,16 +457,14 @@ def write_simple_detail_json(project_name, project_packages):
                     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)
