diff --git a/swh/loader/package/archive/tests/test_archive.py b/swh/loader/package/archive/tests/test_archive.py --- a/swh/loader/package/archive/tests/test_archive.py +++ b/swh/loader/package/archive/tests/test_archive.py @@ -3,6 +3,7 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information +import datetime import hashlib from io import BytesIO from pathlib import Path @@ -22,7 +23,6 @@ Snapshot, SnapshotBranch, TargetType, - Timestamp, TimestampWithTimezone, ) @@ -186,10 +186,8 @@ target_type=ObjectType.DIRECTORY, synthetic=True, author=Person.from_fullname(b""), - date=TimestampWithTimezone( - timestamp=Timestamp(seconds=944729610, microseconds=0), - offset=0, - negative_utc=False, + date=TimestampWithTimezone.from_datetime( + datetime.datetime(1999, 12, 9, 8, 53, 30, tzinfo=datetime.timezone.utc) ), ) diff --git a/swh/loader/package/cran/tests/test_cran.py b/swh/loader/package/cran/tests/test_cran.py --- a/swh/loader/package/cran/tests/test_cran.py +++ b/swh/loader/package/cran/tests/test_cran.py @@ -27,7 +27,6 @@ Snapshot, SnapshotBranch, TargetType, - Timestamp, TimestampWithTimezone, ) @@ -221,10 +220,8 @@ name=b"Brian Ripley", email=b"ripley@stats.ox.ac.uk", ), - date=TimestampWithTimezone( - timestamp=Timestamp(seconds=991958400, microseconds=0), - offset=0, - negative_utc=False, + date=TimestampWithTimezone.from_datetime( + datetime(2001, 6, 8, 0, 0, tzinfo=timezone.utc) ), ) diff --git a/swh/loader/package/debian/tests/test_debian.py b/swh/loader/package/debian/tests/test_debian.py --- a/swh/loader/package/debian/tests/test_debian.py +++ b/swh/loader/package/debian/tests/test_debian.py @@ -4,6 +4,7 @@ # See top-level LICENSE file for more information from copy import deepcopy +import datetime import hashlib import logging from os import path @@ -32,7 +33,6 @@ Snapshot, SnapshotBranch, TargetType, - Timestamp, TimestampWithTimezone, ) @@ -155,10 +155,16 @@ name=b"Samuel Thibault", email=b"sthibault@debian.org", ), - date=TimestampWithTimezone( - timestamp=Timestamp(seconds=1413730355, microseconds=0), - offset=120, - negative_utc=False, + date=TimestampWithTimezone.from_datetime( + datetime.datetime( + 2014, + 10, + 19, + 16, + 52, + 35, + tzinfo=datetime.timezone(datetime.timedelta(seconds=7200)), + ) ), ) diff --git a/swh/loader/package/deposit/tests/test_deposit.py b/swh/loader/package/deposit/tests/test_deposit.py --- a/swh/loader/package/deposit/tests/test_deposit.py +++ b/swh/loader/package/deposit/tests/test_deposit.py @@ -3,6 +3,7 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information +import datetime import json import re from typing import List @@ -22,7 +23,6 @@ Snapshot, SnapshotBranch, TargetType, - Timestamp, TimestampWithTimezone, ) from swh.model.model import MetadataAuthority, MetadataAuthorityType, MetadataFetcher @@ -195,10 +195,8 @@ check_snapshot(expected_snapshot, storage=loader.storage) release = loader.storage.release_get([release_id])[0] - date = TimestampWithTimezone( - timestamp=Timestamp(seconds=1507389428, microseconds=0), - offset=0, - negative_utc=False, + date = TimestampWithTimezone.from_datetime( + datetime.datetime(2017, 10, 7, 15, 17, 8, tzinfo=datetime.timezone.utc) ) person = Person( fullname=b"Software Heritage", @@ -538,10 +536,8 @@ check_snapshot(expected_snapshot, storage=loader.storage) release = loader.storage.release_get([release_id])[0] - date = TimestampWithTimezone( - timestamp=Timestamp(seconds=1507389428, microseconds=0), - offset=0, - negative_utc=False, + date = TimestampWithTimezone.from_datetime( + datetime.datetime(2017, 10, 7, 15, 17, 8, tzinfo=datetime.timezone.utc) ) person = Person( fullname=b"Software Heritage", diff --git a/swh/loader/package/maven/tests/test_maven.py b/swh/loader/package/maven/tests/test_maven.py --- a/swh/loader/package/maven/tests/test_maven.py +++ b/swh/loader/package/maven/tests/test_maven.py @@ -3,6 +3,7 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information +import datetime import hashlib import json from pathlib import Path @@ -20,7 +21,6 @@ Snapshot, SnapshotBranch, TargetType, - Timestamp, TimestampWithTimezone, ) from swh.model.model import MetadataAuthority, MetadataAuthorityType, MetadataFetcher @@ -210,10 +210,8 @@ b"sprova4j/0.1.0/sprova4j-0.1.0-sources.jar\n" ) -REVISION_DATE = TimestampWithTimezone( - timestamp=Timestamp(seconds=1626116819, microseconds=335000), - offset=0, - negative_utc=False, +REVISION_DATE = TimestampWithTimezone.from_datetime( + datetime.datetime(2021, 7, 12, 19, 6, 59, 335000, tzinfo=datetime.timezone.utc) ) diff --git a/swh/loader/package/npm/tests/test_npm.py b/swh/loader/package/npm/tests/test_npm.py --- a/swh/loader/package/npm/tests/test_npm.py +++ b/swh/loader/package/npm/tests/test_npm.py @@ -3,6 +3,7 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information +import datetime import json import os @@ -23,7 +24,6 @@ Snapshot, SnapshotBranch, TargetType, - Timestamp, TimestampWithTimezone, ) from swh.model.model import MetadataAuthority, MetadataAuthorityType, MetadataFetcher @@ -355,10 +355,8 @@ name=b"mooz", email=b"stillpedant@gmail.com", ), - date=TimestampWithTimezone( - timestamp=Timestamp(seconds=1388590833, microseconds=0), - offset=0, - negative_utc=False, + date=TimestampWithTimezone.from_datetime( + datetime.datetime(2014, 1, 1, 15, 40, 33, tzinfo=datetime.timezone.utc) ), id=hash_to_bytes(release_id), ) diff --git a/swh/loader/tests/test_init.py b/swh/loader/tests/test_init.py --- a/swh/loader/tests/test_init.py +++ b/swh/loader/tests/test_init.py @@ -98,10 +98,16 @@ email=b"nicolas@example.com", fullname=b"Nicolas Dandrimont ", ), - date=TimestampWithTimezone( - timestamp=Timestamp(seconds=1234567890, microseconds=0), - offset=120, - negative_utc=False, + date=TimestampWithTimezone.from_datetime( + datetime.datetime( + 2009, + 2, + 14, + 1, + 31, + 30, + tzinfo=datetime.timezone(datetime.timedelta(seconds=7200)), + ) ), committer=Person( name=b"St\xc3fano Zacchiroli", @@ -135,10 +141,8 @@ author=Person( name=b"tony", email=b"tony@ardumont.fr", fullname=b"tony ", ), - date=TimestampWithTimezone( - timestamp=Timestamp(seconds=1634336813, microseconds=0), - offset=0, - negative_utc=False, + date=TimestampWithTimezone.from_datetime( + datetime.datetime(2021, 10, 15, 22, 26, 53, tzinfo=datetime.timezone.utc) ), target=REVISION.id, target_type=ObjectType.REVISION,