diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,4 +1,4 @@ -swh.storage >= 0.0.178 -swh.model >= 0.0.60 +swh.storage >= 0.1 +swh.model >= 0.3 swh.scheduler >= 0.0.39 -swh.loader.core >= 0.1.0 +swh.loader.core >= 0.2 diff --git a/swh/loader/svn/converters.py b/swh/loader/svn/converters.py --- a/swh/loader/svn/converters.py +++ b/swh/loader/svn/converters.py @@ -3,7 +3,7 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information -from typing import Any, Dict, List, Optional +from typing import Any, Dict, Optional, Sequence from swh.model.model import Person, Revision, RevisionType, TimestampWithTimezone @@ -41,7 +41,7 @@ def build_swh_revision( - rev: int, commit: Dict, repo_uuid: str, dir_id: bytes, parents: List[bytes] + rev: int, commit: Dict, repo_uuid: str, dir_id: bytes, parents: Sequence[bytes] ) -> Revision: """Given a svn revision, build a swh revision. @@ -80,5 +80,5 @@ committer=author, synthetic=True, metadata=metadata, - parents=parents, + parents=tuple(parents), ) diff --git a/swh/loader/svn/tests/test_converters.py b/swh/loader/svn/tests/test_converters.py --- a/swh/loader/svn/tests/test_converters.py +++ b/swh/loader/svn/tests/test_converters.py @@ -62,7 +62,7 @@ "author_date": date, }, rev=10, - parents=[], + parents=(), ) expected_rev = Revision.from_dict( @@ -86,7 +86,7 @@ "metadata": { "extra_headers": [["svn_repo_uuid", b"uuid"], ["svn_revision", b"10"],] }, - "parents": [], + "parents": (), } ) diff --git a/swh/loader/svn/tests/test_loader.py b/swh/loader/svn/tests/test_loader.py --- a/swh/loader/svn/tests/test_loader.py +++ b/swh/loader/svn/tests/test_loader.py @@ -216,7 +216,9 @@ "snapshot": Snapshot.from_dict({"id": GOURMET_FLAG_SNAPSHOT, "branches": {}}), "revision": { "id": hashutil.hash_to_bytes("4876cb10aec6f708f7466dddf547567b65f6c39c"), - "parents": [hashutil.hash_to_bytes("a3a577948fdbda9d1061913b77a1588695eadb41")], + "parents": ( + hashutil.hash_to_bytes("a3a577948fdbda9d1061913b77a1588695eadb41"), + ), "directory": hashutil.hash_to_bytes("0deab3023ac59398ae467fc4bff5583008af1ee2"), "target_type": "revision", "metadata": { @@ -422,9 +424,9 @@ "id": hashutil.hash_to_bytes( "4876cb10aec6f708f7466dddf547567b65f6c39c" ), - "parents": [ - hashutil.hash_to_bytes("a3a577948fdbda9d1061913b77a1588695eadb41") - ], + "parents": ( + hashutil.hash_to_bytes("a3a577948fdbda9d1061913b77a1588695eadb41"), + ), "directory": hashutil.hash_to_bytes( "0deab3023ac59398ae467fc4bff5583008af1ee2" ), @@ -490,9 +492,9 @@ def setUp(self): previous_unfinished_revision = { "id": hashutil.hash_to_bytes("a3a577948fdbda9d1061913b77a1588695eadb41"), - "parents": [ - hashutil.hash_to_bytes("3f51abf3b3d466571be0855dfa67e094f9ceff1b") - ], + "parents": ( + hashutil.hash_to_bytes("3f51abf3b3d466571be0855dfa67e094f9ceff1b"), + ), "directory": hashutil.hash_to_bytes( "7dc52cc04c3b8bd7c085900d60c159f7b846f866" ), @@ -562,9 +564,9 @@ "id": hashutil.hash_to_bytes( "a3a577948fdbda9d1061913b77a1588695eadb41" ), - "parents": [ - hashutil.hash_to_bytes("3f51abf3b3d466571be0855dfa67e094f9ceff1b") - ], + "parents": ( + hashutil.hash_to_bytes("3f51abf3b3d466571be0855dfa67e094f9ceff1b"), + ), "directory": hashutil.hash_to_bytes( "7dc52cc04c3b8bd7c085900d60c159f7b846f866" ), @@ -579,9 +581,9 @@ } previous_unfinished_revision = { "id": hashutil.hash_to_bytes("4876cb10aec6f708f7466dddf547567b65f6c39c"), - "parents": [ - hashutil.hash_to_bytes("a3a577948fdbda9d1061913b77a1588695eadb41") - ], + "parents": ( + hashutil.hash_to_bytes("a3a577948fdbda9d1061913b77a1588695eadb41"), + ), "directory": hashutil.hash_to_bytes( "0deab3023ac59398ae467fc4bff5583008af1ee2" ),