diff --git a/swh/provenance/cli.py b/swh/provenance/cli.py --- a/swh/provenance/cli.py +++ b/swh/provenance/cli.py @@ -137,7 +137,7 @@ revisions_provider = ( line.strip().split(",") for line in open(filename, "r") if line.strip() ) - revisions = CSVRevisionIterator(revisions_provider, archive, limit=limit) + revisions = CSVRevisionIterator(revisions_provider, limit=limit) for revision in revisions: revision_add( diff --git a/swh/provenance/revision.py b/swh/provenance/revision.py --- a/swh/provenance/revision.py +++ b/swh/provenance/revision.py @@ -1,12 +1,10 @@ from datetime import datetime, timezone from itertools import islice -import threading from typing import Iterable, Iterator, Optional, Tuple import iso8601 from swh.model.hashutil import hash_to_bytes -from swh.provenance.archive import ArchiveInterface from swh.provenance.model import RevisionEntry ######################################################################################## @@ -29,7 +27,6 @@ def __init__( self, revisions: Iterable[Tuple[bytes, datetime, bytes]], - archive: ArchiveInterface, limit: Optional[int] = None, ): self.revisions: Iterator[Tuple[bytes, datetime, bytes]] @@ -37,20 +34,17 @@ self.revisions = islice(revisions, limit) else: self.revisions = iter(revisions) - self.mutex = threading.Lock() - self.archive = archive def __iter__(self): return self def __next__(self): - with self.mutex: - id, date, root = next(self.revisions) - date = iso8601.parse_date(date) - if date.tzinfo is None: - date = date.replace(tzinfo=timezone.utc) - return RevisionEntry( - hash_to_bytes(id), - date=date, - root=hash_to_bytes(root), - ) + id, date, root = next(self.revisions) + date = iso8601.parse_date(date) + if date.tzinfo is None: + date = date.replace(tzinfo=timezone.utc) + return RevisionEntry( + hash_to_bytes(id), + date=date, + root=hash_to_bytes(root), + ) diff --git a/swh/provenance/tests/test_revision_iterator.py b/swh/provenance/tests/test_revision_iterator.py --- a/swh/provenance/tests/test_revision_iterator.py +++ b/swh/provenance/tests/test_revision_iterator.py @@ -17,7 +17,7 @@ "out-of-order", ), ) -def test_archive_direct_revision_iterator(swh_storage, archive_direct, repo): +def test_archive_direct_revision_iterator(swh_storage, repo): """Test CSVRevisionIterator""" data = load_repo_data(repo) fill_storage(swh_storage, data) @@ -25,6 +25,6 @@ (rev["id"], ts2dt(rev["date"]).isoformat(), rev["directory"]) for rev in data["revision"] ] - revisions = list(CSVRevisionIterator(revisions_csv, archive_direct)) + revisions = list(CSVRevisionIterator(revisions_csv)) assert revisions assert len(revisions) == len(data["revision"])