Page MenuHomeSoftware Heritage

D6437.diff
No OneTemporary

D6437.diff

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
@@ -14,12 +14,6 @@
from swh.loader.package.loader import now
from swh.loader.tests import assert_last_visit_matches, check_snapshot, get_stats
from swh.model.hashutil import hash_to_bytes, hash_to_hex
-from swh.model.identifiers import (
- CoreSWHID,
- ExtendedObjectType,
- ExtendedSWHID,
- ObjectType,
-)
from swh.model.model import (
MetadataAuthority,
MetadataAuthorityType,
@@ -30,6 +24,7 @@
SnapshotBranch,
TargetType,
)
+from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
DEPOSIT_URL = "https://deposit.softwareheritage.org/1/private"
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
@@ -38,12 +38,6 @@
from swh.model import from_disk
from swh.model.collections import ImmutableDict
from swh.model.hashutil import hash_to_hex
-from swh.model.identifiers import (
- CoreSWHID,
- ExtendedObjectType,
- ExtendedSWHID,
- ObjectType,
-)
from swh.model.model import (
ExtID,
MetadataAuthority,
@@ -58,6 +52,7 @@
Snapshot,
TargetType,
)
+from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
from swh.storage.algos.snapshot import snapshot_get_latest
from swh.storage.interface import StorageInterface
from swh.storage.utils import now
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
@@ -24,7 +24,6 @@
from swh.loader.tests import check_snapshot as check_snapshot_full
from swh.loader.tests import get_stats
from swh.model.hashutil import hash_to_bytes
-from swh.model.identifiers import ExtendedObjectType, ExtendedSWHID
from swh.model.model import (
MetadataAuthority,
MetadataAuthorityType,
@@ -34,6 +33,7 @@
SnapshotBranch,
TargetType,
)
+from swh.model.swhids import ExtendedObjectType, ExtendedSWHID
from swh.storage.algos.origin import origin_get_latest_visit_status
from swh.storage.algos.snapshot import snapshot_get_all_branches
from swh.storage.exc import HashCollision
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
@@ -16,12 +16,6 @@
)
from swh.loader.tests import assert_last_visit_matches, check_snapshot, get_stats
from swh.model.hashutil import hash_to_bytes
-from swh.model.identifiers import (
- CoreSWHID,
- ExtendedObjectType,
- ExtendedSWHID,
- ObjectType,
-)
from swh.model.model import (
MetadataAuthority,
MetadataAuthorityType,
@@ -32,6 +26,7 @@
SnapshotBranch,
TargetType,
)
+from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
from swh.storage.interface import PagedResult
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
@@ -22,12 +22,6 @@
)
from swh.loader.tests import assert_last_visit_matches, check_snapshot, get_stats
from swh.model.hashutil import hash_to_bytes
-from swh.model.identifiers import (
- CoreSWHID,
- ExtendedObjectType,
- ExtendedSWHID,
- ObjectType,
-)
from swh.model.model import (
MetadataAuthority,
MetadataAuthorityType,
@@ -38,6 +32,7 @@
SnapshotBranch,
TargetType,
)
+from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
from swh.storage.interface import PagedResult
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
@@ -12,7 +12,6 @@
import pytest
from swh.loader.package.loader import BasePackageInfo, PackageLoader
-from swh.model.identifiers import CoreSWHID, ObjectType
from swh.model.model import (
ExtID,
Origin,
@@ -22,6 +21,7 @@
SnapshotBranch,
TargetType,
)
+from swh.model.swhids import CoreSWHID, ObjectType
from swh.storage import get_storage
from swh.storage.algos.snapshot import snapshot_get_latest
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
@@ -15,12 +15,6 @@
RawExtrinsicMetadataCore,
)
from swh.model.hashutil import hash_to_bytes
-from swh.model.identifiers import (
- CoreSWHID,
- ExtendedObjectType,
- ExtendedSWHID,
- ObjectType,
-)
from swh.model.model import (
MetadataAuthority,
MetadataAuthorityType,
@@ -32,6 +26,7 @@
RevisionType,
Sha1Git,
)
+from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
EMPTY_SNAPSHOT_ID = "1a8893e6a86f444e8be8e7bda6cb34fb1735a00e"
FULL_SNAPSHOT_ID = "4a9b608c9f01860a627237dd2409d1d50ec4b054"

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 3, 3:46 PM (2 w, 18 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3217697

Event Timeline