diff --git a/docs/package-loader-tutorial.rst b/docs/package-loader-tutorial.rst
index 9008450a3132b601b42e645c9e2a04e7b59b5eb9..2cf5b77e10d537cc58c80b5c63a1da454f1307c4 100644
--- a/docs/package-loader-tutorial.rst
+++ b/docs/package-loader-tutorial.rst
@@ -318,11 +318,11 @@ are used in this test::
branches={
b"releases/1.1.0/nexter-1.1.0.zip": SnapshotBranch(
target=hash_to_bytes("f7d43faeb65b64d3faa67e4f46559db57d26b9a4"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1.1.0/nexter-1.1.0.tar.gz": SnapshotBranch(
target=hash_to_bytes("732bb9dc087e6015884daaebb8b82559be729b5a"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
diff --git a/swh/loader/core/loader.py b/swh/loader/core/loader.py
index 785c726ae584463bf895bed7c06c79b9396f30ef..104b82b9453de89ee698b0e9289a38632044f090 100644
--- a/swh/loader/core/loader.py
+++ b/swh/loader/core/loader.py
@@ -50,7 +50,7 @@ from swh.model.model import (
Sha1Git,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
)
from swh.storage import get_storage
from swh.storage.algos.snapshot import snapshot_get_latest
@@ -952,7 +952,7 @@ class ContentLoader(NodeLoader):
branches={
b"HEAD": SnapshotBranch(
target=self.content.sha1_git,
- target_type=TargetType.CONTENT,
+ target_type=SnapshotTargetType.CONTENT,
),
}
)
@@ -1077,7 +1077,7 @@ class BaseDirectoryLoader(NodeLoader):
branches={
b"HEAD": SnapshotBranch(
target=self.directory.hash,
- target_type=TargetType.DIRECTORY,
+ target_type=SnapshotTargetType.DIRECTORY,
),
}
)
diff --git a/swh/loader/core/tests/test_loader.py b/swh/loader/core/tests/test_loader.py
index 42652aba6f785a68df3ddb07b16b01745e7f71b8..41bd2e08c7c986b7596b5bda2767217c4830e5c4 100644
--- a/swh/loader/core/tests/test_loader.py
+++ b/swh/loader/core/tests/test_loader.py
@@ -39,7 +39,7 @@ from swh.model.model import (
RawExtrinsicMetadata,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
)
from .conftest import compute_hashes, compute_nar_hashes
@@ -403,7 +403,7 @@ class DummyLoaderWithPartialSnapshot(DummyBaseLoader):
branches={
b"alias": SnapshotBranch(
target=hash_to_bytes(b"0" * 20),
- target_type=TargetType.DIRECTORY,
+ target_type=SnapshotTargetType.DIRECTORY,
)
}
)
diff --git a/swh/loader/package/arch/tests/test_arch.py b/swh/loader/package/arch/tests/test_arch.py
index c2ea262839be74206ded89e643bd89eefa4a748f..51946e79839ba7160cedbea4f5a598768146a36c 100644
--- a/swh/loader/package/arch/tests/test_arch.py
+++ b/swh/loader/package/arch/tests/test_arch.py
@@ -16,7 +16,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -137,11 +137,11 @@ def test_arch_loader_load_one_version(datadir, requests_mock_datadir, swh_storag
branches={
b"releases/1.12-1/gzip-1.12-1-aarch64.pkg.tar.xz": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/1.12-1/gzip-1.12-1-aarch64.pkg.tar.xz",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -203,16 +203,16 @@ def test_arch_loader_load_n_versions(datadir, requests_mock_datadir, swh_storage
b"releases/1:1.3_20190211-1/"
b"dialog-1:1.3_20190211-1-x86_64.pkg.tar.xz": SnapshotBranch(
target=hash_to_bytes("37efb727ff8bb8fbf92518aa8fe5fff2ad427d06"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1:1.3_20220414-1/"
b"dialog-1:1.3_20220414-1-x86_64.pkg.tar.zst": SnapshotBranch(
target=hash_to_bytes("020d3f5627df7474f257fd04f1ede4415296e265"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/1:1.3_20220414-1/dialog-1:1.3_20220414-1-x86_64.pkg.tar.zst",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
diff --git a/swh/loader/package/archive/tests/test_archive.py b/swh/loader/package/archive/tests/test_archive.py
index 0c59bcfa816f041ed2c82c2260bd3a10ece52b25..6c385f81b3eb144e2836ed379d76bea44c47a951 100644
--- a/swh/loader/package/archive/tests/test_archive.py
+++ b/swh/loader/package/archive/tests/test_archive.py
@@ -23,7 +23,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -213,11 +213,11 @@ def test_archive_visit_with_skipped_content(swh_storage, requests_mock_datadir):
id=expected_snapshot_first_visit_id,
branches={
b"HEAD": SnapshotBranch(
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
target=b"releases/0.1.0",
),
b"releases/0.1.0": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=release_id,
),
},
@@ -288,11 +288,11 @@ def test_archive_visit_with_release_artifact_no_prior_visit(
id=expected_snapshot_first_visit_id,
branches={
b"HEAD": SnapshotBranch(
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
target=b"releases/0.1.0",
),
b"releases/0.1.0": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=release_id,
),
},
diff --git a/swh/loader/package/aur/tests/test_aur.py b/swh/loader/package/aur/tests/test_aur.py
index 86e69ee50fff61048f5c02614195676c8664abac..e8ce2031b9c26f5fe6aa5faa896929d27412265f 100644
--- a/swh/loader/package/aur/tests/test_aur.py
+++ b/swh/loader/package/aur/tests/test_aur.py
@@ -11,7 +11,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -153,11 +153,11 @@ def test_aur_loader_load_one_version(datadir, requests_mock_datadir, swh_storage
branches={
b"releases/10.5.2-1/hg-evolve.tar.gz": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/10.5.2-1/hg-evolve.tar.gz",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
diff --git a/swh/loader/package/bioconductor/tests/test_bioconductor.py b/swh/loader/package/bioconductor/tests/test_bioconductor.py
index 4e276d6a737bf1b30b1aa26f43a2550ba750bbe8..2b5ceb97692dd65658890a15ee52bbdf496b9641 100644
--- a/swh/loader/package/bioconductor/tests/test_bioconductor.py
+++ b/swh/loader/package/bioconductor/tests/test_bioconductor.py
@@ -14,7 +14,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
)
from swh.storage.interface import StorageInterface
@@ -87,11 +87,11 @@ snapshot = Snapshot(
branches={
b"releases/3.16/bioc/1.46.0": SnapshotBranch(
target=release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/3.16/bioc/1.46.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -101,15 +101,15 @@ new_snapshot = Snapshot(
branches={
b"releases/3.16/bioc/1.46.0": SnapshotBranch(
target=release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/3.17/bioc/1.48.0": SnapshotBranch(
target=new_release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/3.17/bioc/1.48.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -228,11 +228,11 @@ def test_old_releases(swh_storage, requests_mock_datadir):
branches={
b"releases/2.2/bioc/1.8.0": SnapshotBranch(
target=old_release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/2.2/bioc/1.8.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
diff --git a/swh/loader/package/conda/tests/test_conda.py b/swh/loader/package/conda/tests/test_conda.py
index b4262ca6538e6777c47b83125d850c8f215898f2..0e16a51d0ac5a52568853e6d3a063f5e27d8b1c3 100644
--- a/swh/loader/package/conda/tests/test_conda.py
+++ b/swh/loader/package/conda/tests/test_conda.py
@@ -12,7 +12,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -101,15 +101,15 @@ def test_conda_loader_load_multiple_version(
branches={
b"releases/linux-64/0.11.1-py36h9f0ad1d_1": SnapshotBranch(
target=first_release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/linux-64/0.11.1-py36hc560c46_1": SnapshotBranch(
target=second_release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/linux-64/0.11.1-py36hc560c46_1",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
diff --git a/swh/loader/package/cpan/tests/test_cpan.py b/swh/loader/package/cpan/tests/test_cpan.py
index dc84dfe7440fa926b108e80ffa46ad0075145857..3cfe0bdde14af6e12c78aa6b4a97e49c29286fdd 100644
--- a/swh/loader/package/cpan/tests/test_cpan.py
+++ b/swh/loader/package/cpan/tests/test_cpan.py
@@ -22,7 +22,7 @@ from swh.model.model import (
ReleaseTargetType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
@@ -126,15 +126,15 @@ def test_cpan_loader_load_multiple_version(
branches={
b"releases/0.01": SnapshotBranch(
target=hash_to_bytes("e73aced4cc3d56b32a328d3248b25b052f029df4"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.05": SnapshotBranch(
target=hash_to_bytes(expected_head_release),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.05",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -222,7 +222,7 @@ def test_cpan_loader_load_multiple_version(
release_swhids = {
CoreSWHID(object_type=ObjectType.RELEASE, object_id=branch.target)
for branch in expected_snapshot.branches.values()
- if branch.target_type == TargetType.RELEASE
+ if branch.target_type == SnapshotTargetType.RELEASE
}
assert {extid.target for extid in extids} == release_swhids
diff --git a/swh/loader/package/cran/tests/test_cran.py b/swh/loader/package/cran/tests/test_cran.py
index b1518e6352b13f21c3e143b6c4273331289ab49c..4ec8497142e4a389882b03276884b26dbdc02219 100644
--- a/swh/loader/package/cran/tests/test_cran.py
+++ b/swh/loader/package/cran/tests/test_cran.py
@@ -26,7 +26,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -36,11 +36,11 @@ SNAPSHOT = Snapshot(
id=hash_to_bytes("c0ccd6452cbe9cd4f0a523b23f09c411bd92ef4e"),
branches={
b"HEAD": SnapshotBranch(
- target=b"releases/2.22-6", target_type=TargetType.ALIAS
+ target=b"releases/2.22-6", target_type=SnapshotTargetType.ALIAS
),
b"releases/2.22-6": SnapshotBranch(
target=RELEASE_ID,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
diff --git a/swh/loader/package/crates/tests/test_crates.py b/swh/loader/package/crates/tests/test_crates.py
index 1ff76f72579fed581d3a7457beede5bbb8e56c4d..d210c4f95e3eb97d2ebb5994d5d6eed4a1d0f8bb 100644
--- a/swh/loader/package/crates/tests/test_crates.py
+++ b/swh/loader/package/crates/tests/test_crates.py
@@ -13,7 +13,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -171,11 +171,11 @@ def test_crates_loader_load_one_version(datadir, requests_mock_datadir, swh_stor
branches={
b"releases/0.0.1/hg-core-0.0.1.crate": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.0.1/hg-core-0.0.1.crate",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -227,39 +227,39 @@ def test_crates_loader_load_n_versions(datadir, requests_mock_datadir, swh_stora
branches={
b"releases/0.4.0/micro-timer-0.4.0.crate": SnapshotBranch(
target=hash_to_bytes("b038a927244c852fb3794aecbebdc70f68ddf067"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.3.1/micro-timer-0.3.1.crate": SnapshotBranch(
target=hash_to_bytes("ea331a2ce755e6f0cd9d05c9be52accde68536c4"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.3.0/micro-timer-0.3.0.crate": SnapshotBranch(
target=hash_to_bytes("7ea45f915ace083ed361bb12593625bf4cf1f5f2"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.2.1/micro-timer-0.2.1.crate": SnapshotBranch(
target=hash_to_bytes("074f27605be8b759e5d7c638f026aac3709f58e5"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.2.0/micro-timer-0.2.0.crate": SnapshotBranch(
target=hash_to_bytes("a1d642aaa54c5361f67e57adbd86e01f3a3276f8"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.1.2/micro-timer-0.1.2.crate": SnapshotBranch(
target=hash_to_bytes("60f18ae067ce235bc60243bf5cdaaae474b11978"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.1.1/micro-timer-0.1.1.crate": SnapshotBranch(
target=hash_to_bytes("fd6c55dfd016d58647a2d44b29a3fd4e3afa7671"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.1.0/micro-timer-0.1.0.crate": SnapshotBranch(
target=hash_to_bytes("3e07559a4b366a397b1ca154e72753ce27223ca1"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.4.0/micro-timer-0.4.0.crate",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
diff --git a/swh/loader/package/debian/tests/test_debian.py b/swh/loader/package/debian/tests/test_debian.py
index 420b24887dcc10a192518623d8737d9973179aec..5e37086494eae760733f3be16d7a04f492ff1ba9 100644
--- a/swh/loader/package/debian/tests/test_debian.py
+++ b/swh/loader/package/debian/tests/test_debian.py
@@ -33,7 +33,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -139,7 +139,7 @@ def test_debian_first_visit(swh_storage, requests_mock_datadir):
id=hash_to_bytes(expected_snapshot_id),
branches={
b"releases/stretch/contrib/0.7.2-3": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=release_id,
)
},
@@ -213,7 +213,7 @@ def test_debian_first_visit_then_another_visit(swh_storage, requests_mock_datadi
id=hash_to_bytes(expected_snapshot_id),
branches={
b"releases/stretch/contrib/0.7.2-3": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=hash_to_bytes("de96ae3d3e136f5c1709117059e2a2c05b8ee5ae"),
)
},
@@ -514,11 +514,11 @@ def _check_debian_loading(swh_storage, packages):
id=hash_to_bytes(expected_snapshot_id),
branches={
b"releases/stretch/contrib/0.7.2-3": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=hash_to_bytes("de96ae3d3e136f5c1709117059e2a2c05b8ee5ae"),
),
b"releases/buster/contrib/0.7.2-4": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=hash_to_bytes("11824484c585319302ea4fde4917faf78dfb1973"),
),
},
diff --git a/swh/loader/package/deposit/tests/test_deposit.py b/swh/loader/package/deposit/tests/test_deposit.py
index 846926d675e411065c8fa50b876291fd3cc5306f..4ab51f1af1ce9a0855a5564214b5332fcfddc7e5 100644
--- a/swh/loader/package/deposit/tests/test_deposit.py
+++ b/swh/loader/package/deposit/tests/test_deposit.py
@@ -25,7 +25,7 @@ from swh.model.model import (
ReleaseTargetType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
@@ -190,7 +190,7 @@ def test_deposit_loading_ok(swh_storage, deposit_client, requests_mock_datadir):
branches={
b"HEAD": SnapshotBranch(
target=release_id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
@@ -320,7 +320,7 @@ def test_deposit_loading_ok_2(swh_storage, deposit_client, requests_mock_datadir
id=hash_to_bytes(expected_snapshot_id),
branches={
b"HEAD": SnapshotBranch(
- target=hash_to_bytes(release_id), target_type=TargetType.RELEASE
+ target=hash_to_bytes(release_id), target_type=SnapshotTargetType.RELEASE
)
},
)
@@ -537,7 +537,7 @@ def test_deposit_loading_ok_release_notes(
branches={
b"HEAD": SnapshotBranch(
target=release_id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
diff --git a/swh/loader/package/hackage/tests/test_hackage.py b/swh/loader/package/hackage/tests/test_hackage.py
index 4b90df85da7c34277887ea9f04e4c922203189ef..94d74d726f5b191e34b142c230eb180a364e7ac9 100644
--- a/swh/loader/package/hackage/tests/test_hackage.py
+++ b/swh/loader/package/hackage/tests/test_hackage.py
@@ -16,7 +16,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -132,11 +132,11 @@ def test_hackage_loader_load_one_version(
branches={
b"releases/2.1.0.0": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/2.1.0.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -214,15 +214,15 @@ def test_hackage_loader_load_multiple_version(
branches={
b"releases/0.3.0.2": SnapshotBranch(
target=hash_to_bytes("639ff93de24d0f2ab53c0d4273128b35f04c794d"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.1": SnapshotBranch(
target=hash_to_bytes("2c2d247d8c0684ec691e95ae8e8ef59bfb757f29"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.3.0.2",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -271,11 +271,11 @@ def test_hackage_loader_load_one_version_caps(
branches={
b"releases/0.6.3": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.6.3",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
diff --git a/swh/loader/package/hex/tests/test_hex.py b/swh/loader/package/hex/tests/test_hex.py
index cf2d4123f08a4ea86173a4d6cf929c2e9557cb5f..b87236559c6b19805828061f56e03cc2079ceb68 100644
--- a/swh/loader/package/hex/tests/test_hex.py
+++ b/swh/loader/package/hex/tests/test_hex.py
@@ -19,7 +19,7 @@ from swh.model.model import (
ReleaseTargetType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
@@ -117,15 +117,15 @@ def first_visit_snapshot(release_6_0, release_6_1):
branches={
b"HEAD": SnapshotBranch(
target=b"releases/0.6.1",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"releases/0.6.0": SnapshotBranch(
target=release_6_0.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.6.1": SnapshotBranch(
target=release_6_1.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
@@ -337,11 +337,11 @@ def test_rpm_multiple_visits(
**first_visit_snapshot.branches,
b"HEAD": SnapshotBranch(
target=b"releases/0.6.2",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"releases/0.6.2": SnapshotBranch(
target=release_6_2.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
diff --git a/swh/loader/package/maven/tests/test_maven.py b/swh/loader/package/maven/tests/test_maven.py
index c19dea8d1c625dc39b09e85f64bb5444238e2d56..417dd68dd4f3ad1e440553d88bba4539b1d32cd0 100644
--- a/swh/loader/package/maven/tests/test_maven.py
+++ b/swh/loader/package/maven/tests/test_maven.py
@@ -28,7 +28,7 @@ from swh.model.model import (
ReleaseTargetType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
@@ -149,15 +149,15 @@ def expected_snapshot(expected_releases):
return Snapshot(
branches={
b"HEAD": SnapshotBranch(
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
target=b"releases/0.1.1",
),
b"releases/0.1.0": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=expected_releases[0].id,
),
b"releases/0.1.1": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=expected_releases[1].id,
),
},
diff --git a/swh/loader/package/npm/tests/test_npm.py b/swh/loader/package/npm/tests/test_npm.py
index 1b9db7baca5e36b63199aa2c47b4ddbf40d82d88..89cbc82958f6dab507ff918584a5a7e5c1f151d2 100644
--- a/swh/loader/package/npm/tests/test_npm.py
+++ b/swh/loader/package/npm/tests/test_npm.py
@@ -27,7 +27,7 @@ from swh.model.model import (
ReleaseTargetType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
@@ -373,13 +373,13 @@ def test_npm_loader_first_visit(swh_storage, requests_mock_datadir, org_api_info
id=expected_snapshot_id,
branches={
b"HEAD": SnapshotBranch(
- target=b"releases/0.0.4", target_type=TargetType.ALIAS
+ target=b"releases/0.0.4", target_type=SnapshotTargetType.ALIAS
),
**{
b"releases/"
+ version_name.encode(): SnapshotBranch(
target=hash_to_bytes(version_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
)
for (version_name, version_id) in versions
},
@@ -551,14 +551,14 @@ def test_npm_loader_version_divergence(swh_storage):
id=expected_snapshot_id,
branches={
b"HEAD": SnapshotBranch(
- target_type=TargetType.ALIAS, target=b"releases/0.1.0"
+ target_type=SnapshotTargetType.ALIAS, target=b"releases/0.1.0"
),
b"releases/0.1.0": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=hash_to_bytes("0c486b50b407f847ef7581f595c2b6c2062f1089"),
),
b"releases/0.1.1-alpha.14": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=hash_to_bytes("79d80c87c0a8d104a216cc539baad962a454802a"),
),
},
@@ -607,13 +607,13 @@ def test_npm_loader_duplicate_shasum(swh_storage, requests_mock_datadir):
id=expected_snapshot_id,
branches={
b"HEAD": SnapshotBranch(
- target=b"releases/0.0.3", target_type=TargetType.ALIAS
+ target=b"releases/0.0.3", target_type=SnapshotTargetType.ALIAS
),
**{
b"releases/"
+ version_name.encode(): SnapshotBranch(
target=hash_to_bytes(version_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
)
for (version_name, version_id) in versions
},
@@ -735,10 +735,10 @@ def test_npm_artifact_use_mtime_if_no_time(swh_storage, requests_mock_datadir):
id=expected_snapshot_id,
branches={
b"HEAD": SnapshotBranch(
- target_type=TargetType.ALIAS, target=b"releases/0.0.1"
+ target_type=SnapshotTargetType.ALIAS, target=b"releases/0.0.1"
),
b"releases/0.0.1": SnapshotBranch(
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
target=hash_to_bytes("3e3b800570869fa9b3dbc302500553e62400cc06"),
),
},
diff --git a/swh/loader/package/opam/tests/test_opam.py b/swh/loader/package/opam/tests/test_opam.py
index 2972527cd4fb2e7050f0784f22357e9bdfa6f73c..b12310db4667a12752e13b7c07fa9f6a6ef594a2 100644
--- a/swh/loader/package/opam/tests/test_opam.py
+++ b/swh/loader/package/opam/tests/test_opam.py
@@ -24,7 +24,7 @@ from swh.model.model import (
ReleaseTargetType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
from swh.storage.interface import PagedResult
@@ -165,11 +165,11 @@ def test_opam_loader_one_version(
branches={
b"HEAD": SnapshotBranch(
target=b"agrid.0.1",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"agrid.0.1": SnapshotBranch(
target=release_id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
@@ -232,19 +232,19 @@ def test_opam_loader_many_version(
branches={
b"HEAD": SnapshotBranch(
target=b"directories.0.3",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"directories.0.1": SnapshotBranch(
target=hash_to_bytes("1c88d466b3d57a619e296999322d096fa37bb1c2"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"directories.0.2": SnapshotBranch(
target=hash_to_bytes("d6f30684039ad485511a138e2ae504ff67a13075"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"directories.0.3": SnapshotBranch(
target=hash_to_bytes("6cf92c0ff052074e69ac18809a9c8198bcc2e746"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
@@ -317,11 +317,11 @@ def test_opam_release(
branches={
b"HEAD": SnapshotBranch(
target=b"ocb.0.1",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"ocb.0.1": SnapshotBranch(
target=release_id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
@@ -369,11 +369,11 @@ def test_opam_metadata(
branches={
b"HEAD": SnapshotBranch(
target=b"ocb.0.1",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"ocb.0.1": SnapshotBranch(
target=expected_release_id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
diff --git a/swh/loader/package/pubdev/tests/test_pubdev.py b/swh/loader/package/pubdev/tests/test_pubdev.py
index 2e9112af00e5da3e2e1c55bb9d712a3dea7a820f..cfb02109d13b519721e770c25bb17e0033e44d46 100644
--- a/swh/loader/package/pubdev/tests/test_pubdev.py
+++ b/swh/loader/package/pubdev/tests/test_pubdev.py
@@ -15,7 +15,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -142,11 +142,11 @@ def test_pubdev_loader_load_one_version(datadir, requests_mock_datadir, swh_stor
branches={
b"releases/0.1.1": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.1.1",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -210,15 +210,15 @@ def test_pubdev_loader_load_multiple_versions(
branches={
b"releases/1.0.0": SnapshotBranch(
target=hash_to_bytes("6f6eecd1ced321778d6a4bc60af4fb0e93178307"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/3.8.2": SnapshotBranch(
target=hash_to_bytes("012bac381e2b9cda7de2da0391bc2969bf80ff97"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/3.8.2",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -265,11 +265,11 @@ def test_pubdev_loader_multiple_authors(datadir, requests_mock_datadir, swh_stor
branches={
b"releases/1.1.5": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/1.1.5",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -304,11 +304,11 @@ def test_pubdev_loader_empty_author(datadir, requests_mock_datadir, swh_storage)
branches={
b"releases/0.0.1": SnapshotBranch(
target=hash_to_bytes(expected_release_id),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.0.1",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -342,15 +342,15 @@ def test_pubdev_loader_dash_in_package_version(requests_mock_datadir, swh_storag
branches={
b"HEAD": SnapshotBranch(
target=hash_to_bytes("72656c65617365732f332e362e31"),
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"releases/2.0.0-nullsafety.1": SnapshotBranch(
target=hash_to_bytes("12156dabe4eb0aaf95810b2e779a61b42c057119"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/3.6.1": SnapshotBranch(
target=hash_to_bytes("3af5c2b85f0d3ab16577ec2f0886367b12d41aab"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
id=hash_to_bytes(expected_snapshot_id),
diff --git a/swh/loader/package/puppet/tests/test_puppet.py b/swh/loader/package/puppet/tests/test_puppet.py
index cc78d4dc4e7ccd503b9d654baff28fdf3870ca5e..f7467c578dd09585df41f1137a44c3c40b5fad0c 100644
--- a/swh/loader/package/puppet/tests/test_puppet.py
+++ b/swh/loader/package/puppet/tests/test_puppet.py
@@ -12,7 +12,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -75,15 +75,15 @@ def test_puppet_loader_load_multiple_version(
branches={
b"HEAD": SnapshotBranch(
target=b"releases/8.1.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"releases/1.0.0": SnapshotBranch(
target=hash_to_bytes("83b3463dd35d44dbae4bfe917a9b127924a14bbd"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/8.1.0": SnapshotBranch(
target=hash_to_bytes("90592c01fe7f96f32a88bc611193b305cb77cc03"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
diff --git a/swh/loader/package/pypi/tests/test_pypi.py b/swh/loader/package/pypi/tests/test_pypi.py
index 971d275851dcb3e0e8f2e7391f640b3ceb72409e..835cb3458b5be79457b8d9676d7d667eb8a63117 100644
--- a/swh/loader/package/pypi/tests/test_pypi.py
+++ b/swh/loader/package/pypi/tests/test_pypi.py
@@ -30,7 +30,7 @@ from swh.model.model import (
RawExtrinsicMetadata,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
from swh.storage.interface import PagedResult
@@ -339,15 +339,15 @@ def test_pypi_release_metadata_structure(
branches={
b"HEAD": SnapshotBranch(
target=b"releases/1.2.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"releases/1.1.0": SnapshotBranch(
target=hash_to_bytes("f8789ff3ed70a5f570c35d885c7bcfda7b23b091"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1.2.0": SnapshotBranch(
target=expected_release_id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
@@ -424,11 +424,11 @@ def test_pypi_visit_with_missing_artifact(
branches={
b"releases/1.2.0": SnapshotBranch(
target=hash_to_bytes("fbbcb817f01111b06442cdcc93140ab3cc777d68"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/1.2.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -469,15 +469,15 @@ def test_pypi_visit_with_1_release_artifact(swh_storage, requests_mock_datadir):
branches={
b"releases/1.1.0": SnapshotBranch(
target=hash_to_bytes("f8789ff3ed70a5f570c35d885c7bcfda7b23b091"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1.2.0": SnapshotBranch(
target=hash_to_bytes("fbbcb817f01111b06442cdcc93140ab3cc777d68"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/1.2.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -516,15 +516,15 @@ def test_pypi_multiple_visits_with_no_change(swh_storage, requests_mock_datadir)
branches={
b"releases/1.1.0": SnapshotBranch(
target=hash_to_bytes("f8789ff3ed70a5f570c35d885c7bcfda7b23b091"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1.2.0": SnapshotBranch(
target=hash_to_bytes("fbbcb817f01111b06442cdcc93140ab3cc777d68"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/1.2.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -613,19 +613,19 @@ def test_pypi_incremental_visit(swh_storage, requests_mock_datadir_visits):
branches={
b"releases/1.1.0": SnapshotBranch(
target=hash_to_bytes("f8789ff3ed70a5f570c35d885c7bcfda7b23b091"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1.2.0": SnapshotBranch(
target=hash_to_bytes("fbbcb817f01111b06442cdcc93140ab3cc777d68"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1.3.0": SnapshotBranch(
target=hash_to_bytes("a21b09cbec8e31f47307f196bb1f939effc26e11"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/1.3.0",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -688,11 +688,11 @@ def test_pypi_visit_1_release_with_2_artifacts(swh_storage, requests_mock_datadi
branches={
b"releases/1.1.0/nexter-1.1.0.zip": SnapshotBranch(
target=hash_to_bytes("f7d43faeb65b64d3faa67e4f46559db57d26b9a4"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/1.1.0/nexter-1.1.0.tar.gz": SnapshotBranch(
target=hash_to_bytes("732bb9dc087e6015884daaebb8b82559be729b5a"),
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)
diff --git a/swh/loader/package/rpm/tests/test_rpm.py b/swh/loader/package/rpm/tests/test_rpm.py
index ec3d6a8872a6c7e2596af351371f64e1373232f6..27957c01bd91312a0375d73e4de149c122114d21 100644
--- a/swh/loader/package/rpm/tests/test_rpm.py
+++ b/swh/loader/package/rpm/tests/test_rpm.py
@@ -17,7 +17,7 @@ from swh.model.model import (
Release,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
@@ -94,15 +94,15 @@ snapshot = Snapshot(
branches={
b"releases/34/Everything/1.18.0-5": SnapshotBranch(
target=release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/34/Everything/1.18.0-5",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"nginx-1.18.0.tar.gz": SnapshotBranch(
target=hash_to_bytes("b0d583b0c289290294657b4c975b2094b9b6803b"),
- target_type=TargetType.DIRECTORY,
+ target_type=SnapshotTargetType.DIRECTORY,
),
},
)
@@ -112,19 +112,19 @@ new_snapshot = Snapshot(
branches={
b"releases/34/Everything/1.18.0-5": SnapshotBranch(
target=release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/35/Everything/1.20.0-5": SnapshotBranch(
target=new_release.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/35/Everything/1.20.0-5",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"nginx-1.18.0.tar.gz": SnapshotBranch(
target=hash_to_bytes("b0d583b0c289290294657b4c975b2094b9b6803b"),
- target_type=TargetType.DIRECTORY,
+ target_type=SnapshotTargetType.DIRECTORY,
),
},
)
diff --git a/swh/loader/package/rubygems/tests/test_rubygems.py b/swh/loader/package/rubygems/tests/test_rubygems.py
index f3537d1c4330fcecf374d5504c7d0de00e89d201..24f496d9ac77c34a8ef0597856d50b9bb562df73 100644
--- a/swh/loader/package/rubygems/tests/test_rubygems.py
+++ b/swh/loader/package/rubygems/tests/test_rubygems.py
@@ -23,7 +23,7 @@ from swh.model.model import (
ReleaseTargetType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
from swh.model.swhids import CoreSWHID, ExtendedObjectType, ExtendedSWHID, ObjectType
@@ -196,15 +196,15 @@ def test_rubygems_loader(
branches={
b"releases/0.0.1": SnapshotBranch(
target=release_0_0_1.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"releases/0.0.2": SnapshotBranch(
target=release_0_0_2.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=b"releases/0.0.2",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
diff --git a/swh/loader/package/tests/test_loader.py b/swh/loader/package/tests/test_loader.py
index f9dbd20829785780836611422f22a88dd8b78a9a..36d9c8efcaa09f0e59e9a36fbe706f4928bb5a04 100644
--- a/swh/loader/package/tests/test_loader.py
+++ b/swh/loader/package/tests/test_loader.py
@@ -33,7 +33,7 @@ from swh.model.model import (
Sha1Git,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
TimestampWithTimezone,
)
from swh.model.swhids import CoreSWHID, ObjectType
@@ -284,13 +284,13 @@ def test_load_extids() -> None:
last_snapshot = Snapshot(
branches={
b"v1.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel1_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel1_swhid.object_id
),
b"v2.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel2_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel2_swhid.object_id
),
b"v3.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel3_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel3_swhid.object_id
),
}
)
@@ -359,16 +359,16 @@ def test_load_extids() -> None:
snapshot = Snapshot(
branches={
b"branch-v1.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel1_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel1_swhid.object_id
),
b"branch-v2.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel4_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel4_swhid.object_id
),
b"branch-v3.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel4_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel4_swhid.object_id
),
b"branch-v4.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel4_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel4_swhid.object_id
),
}
)
@@ -452,10 +452,10 @@ def test_load_upgrade_from_revision_extids(caplog):
last_snapshot = Snapshot(
branches={
b"v1.0": SnapshotBranch(
- target_type=TargetType.REVISION, target=rev1_swhid.object_id
+ target_type=SnapshotTargetType.REVISION, target=rev1_swhid.object_id
),
b"v2.0": SnapshotBranch(
- target_type=TargetType.REVISION, target=rev2_swhid.object_id
+ target_type=SnapshotTargetType.REVISION, target=rev2_swhid.object_id
),
}
)
@@ -525,13 +525,13 @@ def test_load_upgrade_from_revision_extids(caplog):
snapshot = Snapshot(
branches={
b"branch-v1.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel1_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel1_swhid.object_id
),
b"branch-v2.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel2_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel2_swhid.object_id
),
b"branch-v3.0": SnapshotBranch(
- target_type=TargetType.RELEASE, target=rel2_swhid.object_id
+ target_type=SnapshotTargetType.RELEASE, target=rel2_swhid.object_id
),
}
)
diff --git a/swh/loader/tests/__init__.py b/swh/loader/tests/__init__.py
index 119f3b1886a4f04514d085d75d4b28a666e492b9..a7085aeda8e7941d9f250a45414a80bbadc93d8a 100644
--- a/swh/loader/tests/__init__.py
+++ b/swh/loader/tests/__init__.py
@@ -12,7 +12,7 @@ from typing import Dict, Iterable, List, Optional, Tuple, Union
from swh.loader.core.nar import Nar
from swh.model.hashutil import hash_to_bytes
-from swh.model.model import ExtID, OriginVisitStatus, Snapshot, TargetType
+from swh.model.model import ExtID, OriginVisitStatus, Snapshot, SnapshotTargetType
from swh.model.swhids import ObjectType
from swh.storage.algos.origin import origin_get_latest_visit_status
from swh.storage.algos.snapshot import snapshot_get_all_branches
@@ -120,7 +120,7 @@ class InexistentObjectsError(AssertionError):
def check_snapshot(
expected_snapshot: Snapshot,
storage: StorageInterface,
- allowed_empty: Iterable[Tuple[TargetType, bytes]] = [],
+ allowed_empty: Iterable[Tuple[SnapshotTargetType, bytes]] = [],
) -> Snapshot:
"""Check that:
- snapshot exists in the storage and match
@@ -161,7 +161,7 @@ def check_snapshot(
object_to_branch[target.target] = branch
# check that alias references target something that exists, otherwise raise
- aliases: List[bytes] = objects_by_target_type.get(TargetType.ALIAS, [])
+ aliases: List[bytes] = objects_by_target_type.get(SnapshotTargetType.ALIAS, [])
for alias in aliases:
if alias not in expected_snapshot.branches:
raise InconsistentAliasBranchError(
@@ -169,7 +169,7 @@ def check_snapshot(
f"should be in {list(expected_snapshot.branches)}"
)
- revs = objects_by_target_type.get(TargetType.REVISION)
+ revs = objects_by_target_type.get(SnapshotTargetType.REVISION)
if revs:
revisions = storage.revision_get(revs)
not_found = [rev_id for rev_id, rev in zip(revs, revisions) if rev is None]
@@ -183,10 +183,12 @@ def check_snapshot(
# retrieve information from revision
for revision in revisions:
assert revision is not None
- objects_by_target_type[TargetType.DIRECTORY].append(revision.directory)
+ objects_by_target_type[SnapshotTargetType.DIRECTORY].append(
+ revision.directory
+ )
object_to_branch[revision.directory] = revision.id
- rels = objects_by_target_type.get(TargetType.RELEASE)
+ rels = objects_by_target_type.get(SnapshotTargetType.RELEASE)
if rels:
not_found = list(storage.release_missing(rels))
if not_found:
@@ -198,7 +200,7 @@ def check_snapshot(
)
# first level dirs exist?
- dirs = objects_by_target_type.get(TargetType.DIRECTORY)
+ dirs = objects_by_target_type.get(SnapshotTargetType.DIRECTORY)
if dirs:
not_found = list(storage.directory_missing(dirs))
if not_found:
@@ -213,15 +215,15 @@ def check_snapshot(
paths = storage.directory_ls(dir_, recursive=True)
for path in paths:
if path["type"] == "dir":
- target_type = TargetType.DIRECTORY
+ target_type = SnapshotTargetType.DIRECTORY
else:
- target_type = TargetType.CONTENT
+ target_type = SnapshotTargetType.CONTENT
target = path["target"]
objects_by_target_type[target_type].append(target)
object_to_branch[target] = dir_
# check nested directories
- dirs = objects_by_target_type.get(TargetType.DIRECTORY)
+ dirs = objects_by_target_type.get(SnapshotTargetType.DIRECTORY)
if dirs:
not_found = list(storage.directory_missing(dirs))
if not_found:
@@ -234,7 +236,7 @@ def check_snapshot(
)
# check contents directories
- cnts = objects_by_target_type.get(TargetType.CONTENT)
+ cnts = objects_by_target_type.get(SnapshotTargetType.CONTENT)
if cnts:
not_found = list(storage.content_missing_per_sha1_git(cnts))
if not_found:
diff --git a/swh/loader/tests/test_init.py b/swh/loader/tests/test_init.py
index a8bfdf266b76c58340fc68cf4597a79344554153..cf6ca61a9969a2712a34aad6ada891b4e7441b25 100644
--- a/swh/loader/tests/test_init.py
+++ b/swh/loader/tests/test_init.py
@@ -33,7 +33,7 @@ from swh.model.model import (
RevisionType,
Snapshot,
SnapshotBranch,
- TargetType,
+ SnapshotTargetType,
Timestamp,
TimestampWithTimezone,
)
@@ -149,19 +149,19 @@ SNAPSHOT = Snapshot(
branches={
b"release/0.1.0": SnapshotBranch(
target=RELEASE.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
b"HEAD": SnapshotBranch(
target=REVISION.id,
- target_type=TargetType.REVISION,
+ target_type=SnapshotTargetType.REVISION,
),
b"alias": SnapshotBranch(
target=b"HEAD",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"evaluation": SnapshotBranch( # branch dedicated to not exist in storage
target=hash_to_bytes("cc4e04c26672dd74e5fd0fecb78b435fb55368f7"),
- target_type=TargetType.REVISION,
+ target_type=SnapshotTargetType.REVISION,
),
},
)
@@ -351,7 +351,9 @@ def test_check_snapshot(swh_storage):
# all should be fine!
check_snapshot(
- SNAPSHOT, swh_storage, allowed_empty=[(TargetType.REVISION, b"evaluation")]
+ SNAPSHOT,
+ swh_storage,
+ allowed_empty=[(SnapshotTargetType.REVISION, b"evaluation")],
)
@@ -376,7 +378,7 @@ def test_check_snapshot_failures(swh_storage):
branches={
b"master": SnapshotBranch(
target=hash_to_bytes(hash_hex),
- target_type=TargetType.REVISION,
+ target_type=SnapshotTargetType.REVISION,
),
},
)
@@ -389,7 +391,7 @@ def test_check_snapshot_failures(swh_storage):
unexpected_snapshot = Snapshot(
branches={
b"tip": SnapshotBranch( # wrong branch
- target=hash_to_bytes(hash_hex), target_type=TargetType.RELEASE
+ target=hash_to_bytes(hash_hex), target_type=SnapshotTargetType.RELEASE
)
},
)
@@ -415,7 +417,7 @@ def test_check_snapshot_failures(swh_storage):
branches={
b"alias": SnapshotBranch(
target=b"HEAD",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
},
)
@@ -434,11 +436,11 @@ def test_check_snapshot_failures(swh_storage):
branches={
b"alias": SnapshotBranch(
target=b"HEAD",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"HEAD": SnapshotBranch(
target=REVISION.id,
- target_type=TargetType.REVISION,
+ target_type=SnapshotTargetType.REVISION,
),
},
)
@@ -461,11 +463,11 @@ def test_check_snapshot_failures(swh_storage):
branches={
b"alias": SnapshotBranch(
target=b"HEAD",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"HEAD": SnapshotBranch(
target=REVISION.id,
- target_type=TargetType.REVISION,
+ target_type=SnapshotTargetType.REVISION,
),
},
)
@@ -491,11 +493,11 @@ def test_check_snapshot_failures(swh_storage):
branches={
b"alias": SnapshotBranch(
target=b"HEAD",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"HEAD": SnapshotBranch(
target=REVISION.id,
- target_type=TargetType.REVISION,
+ target_type=SnapshotTargetType.REVISION,
),
},
)
@@ -514,15 +516,15 @@ def test_check_snapshot_failures(swh_storage):
branches={
b"alias": SnapshotBranch(
target=b"HEAD",
- target_type=TargetType.ALIAS,
+ target_type=SnapshotTargetType.ALIAS,
),
b"HEAD": SnapshotBranch(
target=REVISION.id,
- target_type=TargetType.REVISION,
+ target_type=SnapshotTargetType.REVISION,
),
b"release/0.1.0": SnapshotBranch(
target=RELEASE.id,
- target_type=TargetType.RELEASE,
+ target_type=SnapshotTargetType.RELEASE,
),
},
)