tmp

Author: jobselko

pulp_python/app/migrations/0017_remove_pythonpackagecontent_sha256_metadata_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.25 on 2025-11-03 20:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("python", "0016_pythonpackagecontent_sha256_metadata_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="pythonpackagecontent",
+            name="sha256_metadata",
+        ),
+        migrations.RemoveField(
+            model_name="pythonpackagecontent",
+            name="yanked",
+        ),
+        migrations.RemoveField(
+            model_name="pythonpackagecontent",
+            name="yanked_reason",
+        ),
+        migrations.AddField(
+            model_name="pythonpackagecontent",
+            name="metadata_sha256",
+            field=models.CharField(max_length=64, null=True),
+        ),
+    ]

pulp_python/app/models.py

@@ -192,9 +192,8 @@ 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)
-    yanked = models.BooleanField(default=False)
-    yanked_reason = models.TextField()
+    metadata_sha256 = models.CharField(max_length=64, null=True)
+    # yanked and yanked_reason are not implemented because they are mutable
 
     # From pulpcore
     PROTECTED_FROM_RECLAIM = False

pulp_python/app/pypi/views.py

@@ -342,10 +342,8 @@ def retrieve(self, request, path, package):
                 "filename",
                 "sha256",
                 "name",
-                "sha256_metadata",
+                "metadata_sha256",
                 "requires_python",
-                "yanked",
-                "yanked_reason",
             )
             .iterator()
         )
@@ -361,12 +359,10 @@ def retrieve(self, request, path, package):
                 "filename": f,
                 "url": urljoin(self.base_content_url, f"{path}/{f}"),
                 "sha256": s,
-                "sha256_metadata": sm,
+                "metadata_sha256": ms,
                 "requires_python": rp,
-                "yanked": y,
-                "yanked_reason": yr,
             }
-            for f, s, _, sm, rp, y, yr in packages
+            for f, s, _, ms, rp in packages
         )
         media_type = request.accepted_renderer.media_type
 
@@ -377,7 +373,7 @@ def retrieve(self, request, path, package):
         else:
             detail_data = write_simple_detail(name, releases, streamed=True)
             kwargs = {"content_type": media_type}
-            return StreamingHttpResponse(detail_data, kwargs)
+            return StreamingHttpResponse(detail_data, **kwargs)
 
     @extend_schema(
         request=PackageUploadSerializer,

pulp_python/app/tasks/publish.py

@@ -101,7 +101,13 @@ def write_simple_api(publication):
         relative_path = release["filename"]
         path = f"../../{relative_path}"
         checksum = release["sha256"]
-        package_releases.append((relative_path, path, checksum))
+        package_releases.append(
+            {
+                "filename": relative_path,
+                "url": path,
+                "sha256": checksum,
+            }
+        )
     # Write the final project's page
     write_project_page(
         name=canonicalize_name(current_name),
@@ -118,7 +124,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(

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 %}
@@ -131,6 +130,7 @@ def parse_project_metadata(project):
         # Release metadata
         "packagetype": project.get("packagetype") or "",
         "python_version": project.get("python_version") or "",
+        "metadata_sha256": "",  # TODO
     }
 
 
@@ -161,9 +161,9 @@ def parse_metadata(project, version, distribution):
     package["requires_python"] = distribution.get("requires_python") or package.get(
         "requires_python"
     )  # 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 package.get("metadata_sha256")
 
     return package
 
@@ -209,10 +209,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 +331,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)
@@ -406,7 +401,6 @@ def find_artifact():
         "upload_time": str(content.pulp_created),
         "upload_time_iso_8601": str(content.pulp_created.isoformat()),
         "url": url,
-        # todo yanked
         "yanked": False,
         "yanked_reason": None,
     }
@@ -429,7 +423,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 +433,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 +444,17 @@ 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)
+                # yanked and yanked_reason are not implemented because they are mutable
+                # TODO in the future:
+                # size, upload-time (v1.1, PEP 700)
                 # core-metadata (PEP 7.14)
                 # provenance (v1.3, PEP 740)
             }
             for package in project_packages
         ],
-        # todo (from new PEPs):
+        # TODO in the future:
         # versions (v1.1, PEP 700)
         # alternate-locations (v1.2, PEP 708)
         # project-status (v1.4, PEP 792 - pypi and docs differ)

pulp_python/tests/functional/api/test_pypi_simple_json_api.py

@@ -62,7 +62,6 @@ def test_simple_json_detail_api(
             "hashes",
             "data-dist-info-metadata",
             "requires_python",
-            "yanked",
         ]:
             assert i in file