Page MenuHomeSoftware Heritage
Files F9696660

D6245.id22607.diff
No OneTemporary
Actions

D6245.id22607.diff
View Options

diff --git a/swh/loader/package/pypi/loader.py b/swh/loader/package/pypi/loader.py
--- a/swh/loader/package/pypi/loader.py
+++ b/swh/loader/package/pypi/loader.py
@@ -129,12 +129,12 @@
return None
# from intrinsic metadata
- name = i_metadata["version"]
+ version = i_metadata.get("version", "")
_author = author(i_metadata)
# from extrinsic metadata
message = p_info.comment_text or ""
- message = "%s: %s" % (name, message) if message else name
+ message = "%s: %s" % (version, message) if message else version
date = TimestampWithTimezone.from_iso8601(p_info.upload_time)
return Revision(
diff --git a/swh/loader/package/pypi/tests/test_pypi.py b/swh/loader/package/pypi/tests/test_pypi.py
--- a/swh/loader/package/pypi/tests/test_pypi.py
+++ b/swh/loader/package/pypi/tests/test_pypi.py
@@ -15,6 +15,7 @@
from swh.loader.package import __version__
from swh.loader.package.pypi.loader import (
PyPILoader,
+ PyPIPackageInfo,
author,
extract_intrinsic_metadata,
pypi_api_url,
@@ -809,3 +810,41 @@
assert_last_visit_matches(
swh_storage, url, status="not_found", type="pypi", snapshot=None
)
+
+
+def test_pypi_build_revision_missing_version_in_pkg_info(swh_storage, tmp_path):
+ """Simulate revision build when Version field is missing in PKG-INFO file."""
+ url = "https://pypi.org/project/GermlineFilter"
+ # create package info
+ p_info = PyPIPackageInfo(
+ url=url,
+ filename="GermlineFilter-1.2.tar.gz",
+ directory_extrinsic_metadata=[],
+ raw_info={},
+ comment_text="",
+ sha256="e4982353c544d94b34f02c5690ab3d3ebc93480d5b62fe6f3317f23c515acc05",
+ upload_time="2015-02-18T20:39:13",
+ )
+
+ # create PKG-INFO file with missing Version field
+ package_path = tmp_path / "GermlineFilter-1.2"
+ pkg_info_path = package_path / "PKG-INFO"
+ package_path.mkdir()
+ pkg_info_path.write_text(
+ """Metadata-Version: 1.2
+Name: germline_filter
+Home-page:
+Author: Cristian Caloian (OICR)
+Author-email: cristian.caloian@oicr.on.ca
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN"""
+ )
+ directory = hash_to_bytes("8b864d66f356afe35033d58f8e03b7c23a66751f")
+
+ # attempt to build revision
+ loader = PyPILoader(swh_storage, url)
+ revision = loader.build_revision(p_info, str(tmp_path), directory)
+
+ # without comment_text and version in PKG-INFO, message should be empty
+ assert not revision.message

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 17, 8:54 PM (16 m, 33 s ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3226008

Event Timeline

About · Developer information · Legal