temp

Author: dralley

pulp_python/app/migrations/0016_pythonpackagecontent_sha256_metadata_and_more.py

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name="pythonpackagecontent",
-            name="sha256_metadata",
+            name="metadata_sha256",
             field=models.CharField(null=True, max_length=64),
             preserve_default=False,
         ),

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, null=True)
+    metadata_sha256 = models.CharField(max_length=64, null=True)
     yanked = models.BooleanField(default=False)
     yanked_reason = models.TextField()
 

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,

pulp_python/app/utils.py

@@ -130,10 +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": ""
-        "sha256_metadata": ""
+        "yanked": False,
+        "yanked_reason": "",
+        "metadata_sha256": "",  # TODO
     }
 
 
@@ -166,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
 
@@ -448,7 +447,7 @@ 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"]