diff --git a/PKG-INFO b/PKG-INFO index 6bf007cf43487927ea173d702e776f3e5bfc4ad6..c0ac50f216d61f1ea7bbdde9081ef7716a80b854 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: swh.model -Version: 0.0.65 +Version: 0.0.66 Summary: Software Heritage data model Home-page: https://forge.softwareheritage.org/diffusion/DMOD/ Author: Software Heritage developers diff --git a/swh.model.egg-info/PKG-INFO b/swh.model.egg-info/PKG-INFO index 6bf007cf43487927ea173d702e776f3e5bfc4ad6..c0ac50f216d61f1ea7bbdde9081ef7716a80b854 100644 --- a/swh.model.egg-info/PKG-INFO +++ b/swh.model.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: swh.model -Version: 0.0.65 +Version: 0.0.66 Summary: Software Heritage data model Home-page: https://forge.softwareheritage.org/diffusion/DMOD/ Author: Software Heritage developers diff --git a/swh/model/hypothesis_strategies.py b/swh/model/hypothesis_strategies.py index a66efdc1c72c4b9ff20b4d4336c84fc902c92180..f5dbe26efa5715c51eda342c1a39de1087a1a182 100644 --- a/swh/model/hypothesis_strategies.py +++ b/swh/model/hypothesis_strategies.py @@ -32,7 +32,7 @@ from .model import ( TimestampWithTimezone, Origin, OriginVisit, - OriginVisitUpdate, + OriginVisitStatus, Snapshot, SnapshotBranch, ObjectType, @@ -153,7 +153,7 @@ def metadata_dicts(): return dictionaries(pgsql_text(), pgsql_text()) -def origin_visit_updates_d(): +def origin_visit_statuses_d(): return builds( dict, visit=integers(0, 1000), @@ -165,8 +165,8 @@ def origin_visit_updates_d(): ) -def origin_visit_updates(): - return origin_visit_updates_d().map(OriginVisitUpdate.from_dict) +def origin_visit_statuses(): + return origin_visit_statuses_d().map(OriginVisitStatus.from_dict) @composite @@ -384,7 +384,7 @@ def objects(): return one_of( origins().map(lambda x: ("origin", x)), origin_visits().map(lambda x: ("origin_visit", x)), - origin_visit_updates().map(lambda x: ("origin_visit_update", x)), + origin_visit_statuses().map(lambda x: ("origin_visit_update", x)), snapshots().map(lambda x: ("snapshot", x)), releases().map(lambda x: ("release", x)), revisions().map(lambda x: ("revision", x)), diff --git a/swh/model/model.py b/swh/model/model.py index 2814fd6bc686f652399581e8391cd606abf9aadd..74702cf435d3dfb60b2d39b247531389c2d349c9 100644 --- a/swh/model/model.py +++ b/swh/model/model.py @@ -243,7 +243,7 @@ class OriginVisit(BaseModel): @attr.s(frozen=True) -class OriginVisitUpdate(BaseModel): +class OriginVisitStatus(BaseModel): """Represents a visit update of an origin at a given point in time. """ @@ -324,7 +324,7 @@ class Snapshot(BaseModel, HashableObject): name: SnapshotBranch.from_dict(branch) if branch else None for (name, branch) in d.pop("branches").items() }, - **d + **d, ) @@ -419,7 +419,7 @@ class Revision(BaseModel, HashableObject): date=date, committer_date=committer_date, type=RevisionType(d.pop("type")), - **d + **d, ) diff --git a/swh/model/tests/test_model.py b/swh/model/tests/test_model.py index b65f75de745cd822a3a3165e3426ee588fa024c8..6027cc2735bc12bd8cb6dc16852dd16a1a4e3535 100644 --- a/swh/model/tests/test_model.py +++ b/swh/model/tests/test_model.py @@ -76,11 +76,11 @@ def test_todict_origin_visits(origin_visit): assert origin_visit == type(origin_visit).from_dict(obj) -@given(strategies.origin_visit_updates()) -def test_todict_origin_visit_updates(origin_visit_update): - obj = origin_visit_update.to_dict() +@given(strategies.origin_visit_statuses()) +def test_todict_origin_visit_statuses(origin_visit_status): + obj = origin_visit_status.to_dict() - assert origin_visit_update == type(origin_visit_update).from_dict(obj) + assert origin_visit_status == type(origin_visit_status).from_dict(obj) # Timestamp diff --git a/version.txt b/version.txt index 0a353c8a28622d3e625745573d3b28ce93374818..13f286901ff637c38568784646672dfab3a33233 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.65-0-g94da010 \ No newline at end of file +v0.0.66-0-g401bc17 \ No newline at end of file