diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,7 +1,7 @@ swh.core >= 0.0.95 swh.indexer >= 0.0.171 -swh.model >= 0.3.0 +swh.model >= 0.3.4 swh.scheduler >= 0.1.1 swh.search >= 0.0.4 -swh.storage >= 0.6.0 +swh.storage >= 0.8.0 swh.vault >= 0.0.33 diff --git a/swh/web/tests/api/views/test_origin.py b/swh/web/tests/api/views/test_origin.py --- a/swh/web/tests/api/views/test_origin.py +++ b/swh/web/tests/api/views/test_origin.py @@ -102,15 +102,7 @@ archive_data.origin_add_one(new_origin) for i, visit_date in enumerate(visit_dates): origin_visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_date, - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_date, type="git",)] )[0] archive_data.snapshot_add([new_snapshots[i]]) visit_status = OriginVisitStatus( @@ -158,15 +150,7 @@ archive_data.origin_add_one(new_origin) for i, visit_date in enumerate(visit_dates): origin_visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_date, - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_date, type="git",)] )[0] archive_data.snapshot_add([new_snapshots[i]]) visit_status = OriginVisitStatus( @@ -214,15 +198,7 @@ archive_data.origin_add_one(new_origin) for i, visit_date in enumerate(visit_dates): origin_visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_date, - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_date, type="git",)] )[0] visit_id = origin_visit.visit archive_data.snapshot_add([new_snapshots[i]]) @@ -278,15 +254,7 @@ visit_ids = [] for i, visit_date in enumerate(visit_dates): origin_visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_date, - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_date, type="git",)] )[0] visit_ids.append(origin_visit.visit) @@ -329,15 +297,7 @@ visit_ids = [] for i, visit_date in enumerate(visit_dates): origin_visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_date, - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_date, type="git",)] )[0] visit_ids.append(origin_visit.visit) diff --git a/swh/web/tests/browse/views/test_origin.py b/swh/web/tests/browse/views/test_origin.py --- a/swh/web/tests/browse/views/test_origin.py +++ b/swh/web/tests/browse/views/test_origin.py @@ -509,15 +509,7 @@ archive_data.snapshot_add([Snapshot.from_dict(snp_dict)]) visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_dates[0], - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)] )[0] visit_status = OriginVisitStatus( origin=new_origin.url, @@ -554,15 +546,7 @@ archive_data.snapshot_add([Snapshot.from_dict(snp_dict)]) visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_dates[0], - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)] )[0] visit_status = OriginVisitStatus( origin=new_origin.url, @@ -812,15 +796,7 @@ archive_data.origin_add([new_origin]) archive_data.snapshot_add([snapshot]) visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=now(), - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=now(), type="git",)] )[0] visit_status = OriginVisitStatus( origin=new_origin.url, @@ -1279,15 +1255,7 @@ archive_data.origin_add([new_origin]) archive_data.snapshot_add([Snapshot.from_dict(snp_dict)]) visit = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=visit_dates[0], - type="git", - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)] )[0] visit_status = OriginVisitStatus( origin=new_origin.url, diff --git a/swh/web/tests/common/test_service.py b/swh/web/tests/common/test_service.py --- a/swh/web/tests/common/test_service.py +++ b/swh/web/tests/common/test_service.py @@ -204,16 +204,7 @@ archive_data.origin_add_one(new_origin) archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=ts, - type="git", - status="ongoing", - snapshot=None, - ) - for ts in visit_dates - ] + [OriginVisit(origin=new_origin.url, date=ts, type="git",) for ts in visit_dates] ) actual_origin_visits = list( @@ -231,16 +222,7 @@ def test_lookup_origin_visit(archive_data, new_origin, visit_dates): archive_data.origin_add_one(new_origin) visits = archive_data.origin_visit_add( - [ - OriginVisit( - origin=new_origin.url, - date=ts, - type="git", - status="ongoing", - snapshot=None, - ) - for ts in visit_dates - ] + [OriginVisit(origin=new_origin.url, date=ts, type="git",) for ts in visit_dates] ) visit = random.choice(visits).visit diff --git a/swh/web/tests/data.py b/swh/web/tests/data.py --- a/swh/web/tests/data.py +++ b/swh/web/tests/data.py @@ -202,9 +202,7 @@ storage.origin_add([Origin(url=url)]) search.origin_update([{"url": url, "has_visits": True}]) date = datetime.datetime(2019, 12, 3, 13, 55, 5, tzinfo=datetime.timezone.utc) - visit = OriginVisit( - origin=url, date=date, type="tar", status="ongoing", snapshot=None - ) + visit = OriginVisit(origin=url, date=date, type="tar") visit = storage.origin_visit_add([visit])[0] visit_status = OriginVisitStatus( origin=url,