diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core >= 0.3 -swh.model >= 0.5.0 +swh.model >= 0.7.2 swh.objstorage >= 0.2.2 swh.scheduler >= 0.4.0 swh.storage >= 0.13.1 diff --git a/swh/loader/package/deposit/tests/test_deposit.py b/swh/loader/package/deposit/tests/test_deposit.py --- a/swh/loader/package/deposit/tests/test_deposit.py +++ b/swh/loader/package/deposit/tests/test_deposit.py @@ -344,7 +344,7 @@ expected_metadata.append( RawExtrinsicMetadata( type=MetadataTargetType.ORIGIN, - id=url, + target=url, discovery_date=origin_meta.discovery_date, metadata=raw_meta.encode(), format="sword-v2-atom-codemeta-v2", @@ -361,7 +361,7 @@ expected_metadata.append( RawExtrinsicMetadata( type=MetadataTargetType.ORIGIN, - id=url, + target=url, discovery_date=origin_extrinsic_metadata.results[-1].discovery_date, metadata=json.dumps(origin_metadata).encode(), format="original-artifacts-json", @@ -387,7 +387,7 @@ revision_swhid = SWHID(object_type="revision", object_id=revision_id) dir_metadata_template = RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=directory_swhid, + target=directory_swhid, format="sword-v2-atom-codemeta-v2", authority=authority, fetcher=fetcher, 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 @@ -565,7 +565,7 @@ original_artifact_metadata = RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=SWHID(object_type="directory", object_id=revision.directory), + target=SWHID(object_type="directory", object_id=revision.directory), discovery_date=self.visit_date, authority=SWH_METADATA_AUTHORITY, fetcher=self.get_metadata_fetcher(), @@ -687,7 +687,7 @@ metadata_objects.append( RawExtrinsicMetadata( type=MetadataTargetType.ORIGIN, - id=self.url, + target=self.url, discovery_date=item.discovery_date or self.visit_date, authority=authority, fetcher=fetcher, @@ -722,7 +722,7 @@ metadata_objects.append( RawExtrinsicMetadata( type=MetadataTargetType.SNAPSHOT, - id=SWHID(object_type="snapshot", object_id=snapshot_id), + target=SWHID(object_type="snapshot", object_id=snapshot_id), discovery_date=item.discovery_date or self.visit_date, authority=authority, fetcher=fetcher, @@ -751,7 +751,7 @@ metadata_objects.append( RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=SWHID(object_type="directory", object_id=directory_id), + target=SWHID(object_type="directory", object_id=directory_id), discovery_date=item.discovery_date or self.visit_date, authority=authority, fetcher=fetcher, diff --git a/swh/loader/package/nixguix/tests/test_nixguix.py b/swh/loader/package/nixguix/tests/test_nixguix.py --- a/swh/loader/package/nixguix/tests/test_nixguix.py +++ b/swh/loader/package/nixguix/tests/test_nixguix.py @@ -275,7 +275,7 @@ expected_metadata = [ RawExtrinsicMetadata( type=MetadataTargetType.SNAPSHOT, - id=snapshot_swhid, + target=snapshot_swhid, authority=metadata_authority, fetcher=MetadataFetcher( name="swh.loader.package.nixguix.loader.NixGuixLoader", diff --git a/swh/loader/package/npm/tests/test_npm.py b/swh/loader/package/npm/tests/test_npm.py --- a/swh/loader/package/npm/tests/test_npm.py +++ b/swh/loader/package/npm/tests/test_npm.py @@ -413,7 +413,7 @@ expected_metadata = [ RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=directory_swhid, + target=directory_swhid, authority=metadata_authority, fetcher=MetadataFetcher( name="swh.loader.package.npm.loader.NpmLoader", version=__version__, 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 @@ -347,7 +347,7 @@ expected_metadata = [ RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=directory_swhid, + target=directory_swhid, authority=metadata_authority, fetcher=MetadataFetcher( name="swh.loader.package.pypi.loader.PyPILoader", version=__version__, diff --git a/swh/loader/package/tests/test_loader_metadata.py b/swh/loader/package/tests/test_loader_metadata.py --- a/swh/loader/package/tests/test_loader_metadata.py +++ b/swh/loader/package/tests/test_loader_metadata.py @@ -53,7 +53,7 @@ DIRECTORY_METADATA = [ RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=DIRECTORY_SWHID, + target=DIRECTORY_SWHID, discovery_date=DISCOVERY_DATE, authority=AUTHORITY, fetcher=FETCHER, @@ -64,7 +64,7 @@ ), RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=DIRECTORY_SWHID, + target=DIRECTORY_SWHID, discovery_date=DISCOVERY_DATE + datetime.timedelta(seconds=1), authority=AUTHORITY, fetcher=FETCHER, @@ -78,7 +78,7 @@ ORIGIN_METADATA = [ RawExtrinsicMetadata( type=MetadataTargetType.ORIGIN, - id=ORIGIN_URL, + target=ORIGIN_URL, discovery_date=datetime.datetime.now(tz=datetime.timezone.utc), authority=AUTHORITY, fetcher=FETCHER, @@ -161,7 +161,7 @@ assert len(result.results) == 1 assert result.results[0] == RawExtrinsicMetadata( type=MetadataTargetType.DIRECTORY, - id=DIRECTORY_SWHID, + target=DIRECTORY_SWHID, discovery_date=result.results[0].discovery_date, authority=authority, fetcher=FETCHER,