diff --git a/swh/loader/package/archive/loader.py b/swh/loader/package/archive/loader.py --- a/swh/loader/package/archive/loader.py +++ b/swh/loader/package/archive/loader.py @@ -33,7 +33,7 @@ @attr.s class ArchivePackageInfo(BasePackageInfo): - raw = attr.ib(type=Dict[str, Any]) + raw_info = attr.ib(type=Dict[str, Any]) length = attr.ib(type=int) """Size of the archive file""" time = attr.ib(type=Union[str, datetime.datetime]) @@ -46,8 +46,8 @@ def artifact_identity(self, id_keys=None): if id_keys is None: id_keys = self.ID_KEYS - # TODO: use parsed attributes instead of self.raw - return [self.raw.get(k) for k in id_keys] + # TODO: use parsed attributes instead of self.raw_info + return [self.raw_info.get(k) for k in id_keys] @classmethod def from_metadata(cls, a_metadata: Dict[str, Any]) -> "ArchivePackageInfo": @@ -56,7 +56,7 @@ return cls( url=url, filename=filename if filename else path.split(url)[-1], - raw=a_metadata, + raw_info=a_metadata, length=a_metadata["length"], time=a_metadata["time"], version=a_metadata["version"], @@ -164,7 +164,7 @@ "extrinsic": { "provider": self.url, "when": self.visit_date.isoformat(), - "raw": p_info.raw, + "raw": p_info.raw_info, }, }, ) diff --git a/swh/loader/package/archive/tests/test_archive.py b/swh/loader/package/archive/tests/test_archive.py --- a/swh/loader/package/archive/tests/test_archive.py +++ b/swh/loader/package/archive/tests/test_archive.py @@ -359,7 +359,9 @@ metadata = GNU_ARTIFACTS[0] - p_info = TestPackageInfo(raw={**metadata, "a": 1, "b": 2}, a=1, b=2, **metadata,) + p_info = TestPackageInfo( + raw_info={**metadata, "a": 1, "b": 2}, a=1, b=2, **metadata, + ) for id_keys, expected_id in [ (["a", "b"], [1, 2]), diff --git a/swh/loader/package/cran/loader.py b/swh/loader/package/cran/loader.py --- a/swh/loader/package/cran/loader.py +++ b/swh/loader/package/cran/loader.py @@ -34,7 +34,7 @@ @attr.s class CRANPackageInfo(BasePackageInfo): - raw = attr.ib(type=Dict[str, Any]) + raw_info = attr.ib(type=Dict[str, Any]) version = attr.ib(type=str) ID_KEYS = ["url", "version"] @@ -45,7 +45,7 @@ return CRANPackageInfo( url=url, filename=path.basename(url), - raw=a_metadata, + raw_info=a_metadata, version=a_metadata["version"], ) @@ -121,7 +121,7 @@ "extrinsic": { "provider": self.url, "when": self.visit_date.isoformat(), - "raw": p_info.raw, + "raw": p_info.raw_info, }, }, ) diff --git a/swh/loader/package/debian/loader.py b/swh/loader/package/debian/loader.py --- a/swh/loader/package/debian/loader.py +++ b/swh/loader/package/debian/loader.py @@ -64,7 +64,7 @@ @attr.s class DebianPackageInfo(BasePackageInfo): - raw = attr.ib(type=Dict[str, Any]) + raw_info = attr.ib(type=Dict[str, Any]) files = attr.ib(type=Dict[str, DebianFileMetadata]) """Metadata of the files (.deb, .dsc, ...) of the package.""" name = attr.ib(type=str) @@ -75,7 +75,7 @@ return cls( url=url, filename=None, - raw=a_metadata, + raw_info=a_metadata, files={ file_name: DebianFileMetadata(**file_metadata) for (file_name, file_metadata) in a_metadata.get("files", {}).items() @@ -228,7 +228,7 @@ "extrinsic": { "provider": dsc_url, "when": self.visit_date.isoformat(), - "raw": p_info.raw, + "raw": p_info.raw_info, }, }, ) diff --git a/swh/loader/package/deposit/loader.py b/swh/loader/package/deposit/loader.py --- a/swh/loader/package/deposit/loader.py +++ b/swh/loader/package/deposit/loader.py @@ -35,7 +35,7 @@ @attr.s class DepositPackageInfo(BasePackageInfo): filename = attr.ib(type=str) # instead of Optional[str] - raw = attr.ib(type=Dict[str, Any]) + raw_info = attr.ib(type=Dict[str, Any]) author_date = attr.ib(type=datetime.datetime) """codemeta:dateCreated if any, deposit completed_date otherwise""" @@ -76,7 +76,7 @@ author=parse_author(depo["author"]), committer=parse_author(depo["committer"]), revision_parents=tuple(hash_to_bytes(p) for p in depo["revision_parents"]), - raw=metadata, + raw_info=metadata, ) @@ -144,7 +144,7 @@ "extrinsic": { "provider": self.client.metadata_url(self.deposit_id), "when": self.visit_date.isoformat(), - "raw": p_info.raw, + "raw": p_info.raw_info, }, }, ) diff --git a/swh/loader/package/loader.py b/swh/loader/package/loader.py --- a/swh/loader/package/loader.py +++ b/swh/loader/package/loader.py @@ -65,7 +65,6 @@ url = attr.ib(type=str) filename = attr.ib(type=Optional[str]) - raw = attr.ib(type=Any) @property def ID_KEYS(self): diff --git a/swh/loader/package/nixguix/loader.py b/swh/loader/package/nixguix/loader.py --- a/swh/loader/package/nixguix/loader.py +++ b/swh/loader/package/nixguix/loader.py @@ -29,7 +29,7 @@ @attr.s class NixGuixPackageInfo(BasePackageInfo): - raw = attr.ib(type=Dict[str, Any]) + raw_info = attr.ib(type=Dict[str, Any]) integrity = attr.ib(type=str) """Hash of the archive, formatted as in the Subresource Integrity @@ -41,7 +41,7 @@ url=metadata["url"], filename=None, integrity=metadata["integrity"], - raw=metadata, + raw_info=metadata, ) @@ -180,7 +180,7 @@ "extrinsic": { "provider": self.provider_url, "when": self.visit_date.isoformat(), - "raw": p_info.raw, + "raw": p_info.raw_info, }, }, ) diff --git a/swh/loader/package/npm/loader.py b/swh/loader/package/npm/loader.py --- a/swh/loader/package/npm/loader.py +++ b/swh/loader/package/npm/loader.py @@ -34,7 +34,7 @@ @attr.s class NpmPackageInfo(BasePackageInfo): - raw = attr.ib(type=Dict[str, Any]) + raw_info = attr.ib(type=Dict[str, Any]) date = attr.ib(type=Optional[str]) shasum = attr.ib(type=str) @@ -66,7 +66,7 @@ date=date, shasum=package_metadata["dist"]["shasum"], version=extrinsic_version, - raw=package_metadata, # FIXME: we're losing some of the project metadata + raw_info=package_metadata, # FIXME: loses some of the project metadata ) @@ -105,9 +105,7 @@ def get_default_version(self) -> str: return self.info["dist-tags"].get("latest", "") - def get_package_info( - self, version: str - ) -> Iterator[Tuple[str, NpmPackageInfo]]: + def get_package_info(self, version: str) -> Iterator[Tuple[str, NpmPackageInfo]]: p_info = NpmPackageInfo.from_metadata( project_metadata=self.info, version=version ) @@ -155,7 +153,7 @@ "extrinsic": { "provider": self.provider_url, "when": self.visit_date.isoformat(), - "raw": p_info.raw, + "raw": p_info.raw_info, }, }, ) 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 @@ -27,7 +27,7 @@ @attr.s class PyPIPackageInfo(BasePackageInfo): - raw = attr.ib(type=Dict[str, Any]) + raw_info = attr.ib(type=Dict[str, Any]) comment_text = attr.ib(type=Optional[str]) sha256 = attr.ib(type=str) @@ -38,7 +38,7 @@ return cls( url=metadata["url"], filename=metadata["filename"], - raw=metadata, + raw_info=metadata, comment_text=metadata.get("comment_text"), sha256=metadata["digests"]["sha256"], upload_time=metadata["upload_time"], @@ -123,7 +123,7 @@ "extrinsic": { "provider": self.provider_url, "when": self.visit_date.isoformat(), - "raw": p_info.raw, + "raw": p_info.raw_info, }, }, ) diff --git a/swh/loader/package/tests/test_loader.py b/swh/loader/package/tests/test_loader.py --- a/swh/loader/package/tests/test_loader.py +++ b/swh/loader/package/tests/test_loader.py @@ -57,7 +57,6 @@ p_info = TestPackageInfo( url="http://example.org/", - raw={}, a=1, b=2, length=221837,