tmp

Author: jobselko

pulp_python/app/utils.py

@@ -158,9 +158,9 @@ def parse_metadata(project, version, distribution):
     package["url"] = distribution.get("url") or ""
     package["sha256"] = distribution.get("digests", {}).get("sha256") or ""
     package["python_version"] = distribution.get("python_version") or package.get("python_version")
-    package["requires_python"] = distribution.get("requires_python") or package.get(
-        "requires_python"
-    )  # noqa: E501
+    package["requires_python"] = distribution.get("requires_python") or ""  # package.get(
+    #     "requires_python"
+    # )  # noqa: E501
     package["metadata_sha256"] = distribution.get("data-dist-info-metadata", {}).get(
         "sha256"
     ) or package.get("metadata_sha256")
@@ -448,7 +448,7 @@ def write_simple_detail_json(project_name, project_packages):
                 "filename": package["filename"],
                 "url": package["url"],
                 "hashes": {"sha256": package["sha256"]},
-                "requires_python": package["requires_python"] or None,
+                "requires-python": package["requires_python"] or None,
                 # data-dist-info-metadata is deprecated alias for core-metadata
                 "data-dist-info-metadata": (
                     {"sha256": package["metadata_sha256"]} if package["metadata_sha256"] else False

pulp_python/tests/functional/api/test_pypi_simple_json_api.py

@@ -44,7 +44,7 @@ def test_simple_json_detail_api(
     repo = python_repo_with_sync(remote)
     distro = python_distribution_factory(repository=repo)
 
-    url = f'{urljoin(distro.base_url, "simple/")}aiohttp'
+    url = f'{urljoin(distro.base_url, "simple/")}django'
     headers = {"Accept": PYPI_SIMPLE_V1_JSON}
 
     response = requests.get(url, headers=headers)
@@ -53,17 +53,30 @@ def test_simple_json_detail_api(
 
     data = response.json()
     assert data["meta"] == {"api-version": API_VERSION, "_last-serial": PYPI_SERIAL_CONSTANT}
-    assert data["name"] == "aiohttp"
+    assert data["name"] == "django"
     assert data["files"]
-    for file in data["files"]:
-        for i in [
-            "filename",
-            "url",
-            "hashes",
-            "data-dist-info-metadata",
-            "requires_python",
-        ]:
-            assert i in file
+
+    # Check data of a wheel file
+    file_whl = next(
+        (i for i in data["files"] if i["filename"] == "Django-1.10.4-py2.py3-none-any.whl"), None
+    )
+    assert file_whl is not None, "wheel file not found"
+    assert file_whl["url"]
+    assert file_whl["hashes"] == {
+        "sha256": "a8e1a552205cda15023c39ecf17f7e525e96c5b0142e7879e8bd0c445351f2cc"
+    }
+    assert file_whl["requires-python"] is None
+    assert file_whl["data-dist-info-metadata"] is False  # todo: wrong
+
+    # Check data of a tar file
+    file_tar = next((i for i in data["files"] if i["filename"] == "Django-1.10.4.tar.gz"), None)
+    assert file_tar is not None, "tar file not found"
+    assert file_tar["url"]
+    assert file_tar["hashes"] == {
+        "sha256": "fff7f062e510d812badde7cfc57745b7779edb4d209b2bc5ea8d954c22305c2b"
+    }
+    assert file_tar["requires-python"] is None
+    assert file_tar["data-dist-info-metadata"] is False
 
 
 @pytest.mark.parallel