Skip to content

Commit e9aada2

Browse files
committed
code style
Signed-off-by: Kunz, Immanuel <[email protected]>
1 parent cb9939d commit e9aada2

File tree

4 files changed

+26
-13
lines changed

4 files changed

+26
-13
lines changed

src/univers/datetime.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
# Visit https://aboutcode.org and https://github.com/aboutcode-org/univers for support and download.
55

66
import re
7+
78
from dateutil.parser import isoparse
89

10+
911
class DatetimeVersion:
1012
"""
1113
datetime version.
1214
1315
The timestamp must be RFC3339-compliant, i.e., a subset of ISO8601, where the date AND time are always specified. Therefore, we can use dateutil's ISO-parser but have to check for compliance with the RFC format first via a regex.
1416
"""
1517

16-
VERSION_PATTERN = re.compile(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$')
18+
VERSION_PATTERN = re.compile(
19+
r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$"
20+
)
1721

1822
def __init__(self, version):
1923
if not self.is_valid(version):
@@ -41,6 +45,7 @@ def __ge__(self, other):
4145
@classmethod
4246
def is_valid(cls, string):
4347
return cls.VERSION_PATTERN.match(string)
44-
48+
49+
4550
class InvalidVersionError(ValueError):
46-
pass
51+
pass

src/univers/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class DatetimeVersion(Version):
138138
@classmethod
139139
def is_valid(cls, string):
140140
return datetime.DatetimeVersion.is_valid(string)
141-
141+
142142
@classmethod
143143
def build_value(self, string):
144144
return datetime.DatetimeVersion(string)

tests/test_version_range.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
from univers.version_range import VersionRange
2424
from univers.version_range import build_range_from_snyk_advisory_string
2525
from univers.version_range import from_gitlab_native
26-
from univers.versions import InvalidVersion
2726
from univers.versions import DatetimeVersion
27+
from univers.versions import InvalidVersion
2828
from univers.versions import NugetVersion
2929
from univers.versions import OpensslVersion
3030
from univers.versions import PypiVersion
@@ -551,12 +551,20 @@ def test_version_range_normalize_case3():
551551

552552

553553
def test_version_range_datetime():
554-
assert DatetimeVersion("2000-01-01T01:02:03.1234Z") in DatetimeVersionRange.from_string("vers:datetime/*")
555-
assert DatetimeVersion("2021-05-05T01:02:03Z") in DatetimeVersionRange.from_string("vers:datetime/>2021-01-01T01:02:03.1234Z|<2022-01-01T01:02:03.1234Z")
554+
assert DatetimeVersion("2000-01-01T01:02:03.1234Z") in DatetimeVersionRange.from_string(
555+
"vers:datetime/*"
556+
)
557+
assert DatetimeVersion("2021-05-05T01:02:03Z") in DatetimeVersionRange.from_string(
558+
"vers:datetime/>2021-01-01T01:02:03.1234Z|<2022-01-01T01:02:03.1234Z"
559+
)
556560
datetime_constraints = DatetimeVersionRange(
557561
constraints=(
558-
VersionConstraint(comparator=">", version=DatetimeVersion(string="2000-01-01T01:02:03Z")),
559-
VersionConstraint(comparator="<", version=DatetimeVersion(string="2002-01-01T01:02:03Z")),
562+
VersionConstraint(
563+
comparator=">", version=DatetimeVersion(string="2000-01-01T01:02:03Z")
564+
),
565+
VersionConstraint(
566+
comparator="<", version=DatetimeVersion(string="2002-01-01T01:02:03Z")
567+
),
560568
)
561569
)
562-
assert DatetimeVersion("2001-01-01T01:02:03Z") in datetime_constraints
570+
assert DatetimeVersion("2001-01-01T01:02:03Z") in datetime_constraints

tests/test_versions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ def test_golang_version():
222222

223223

224224
def test_datetime_version():
225-
assert DatetimeVersion("2023-10-28T18:30:00Z") == DatetimeVersion("2023-10-28T18:30:00Z")
225+
assert DatetimeVersion("2023-10-28T18:30:00Z") == DatetimeVersion("2023-10-28T18:30:00Z")
226226
assert DatetimeVersion("2023-01-11T10:10:10Z") > DatetimeVersion("2023-01-10T10:10:10Z")
227-
assert DatetimeVersion("2022-10-28T18:30:00Z") < DatetimeVersion("2023-10-28T18:30:00Z")
227+
assert DatetimeVersion("2022-10-28T18:30:00Z") < DatetimeVersion("2023-10-28T18:30:00Z")
228228
assert DatetimeVersion("2022-10-28T18:30:00Z") <= DatetimeVersion("2023-10-28T18:30:00Z")
229229
assert DatetimeVersion("2024-10-28T18:30:00Z") > DatetimeVersion("2023-10-28T18:30:00Z")
230-
assert DatetimeVersion("2023-10-28T19:30:00+01:00") == DatetimeVersion("2023-10-28T18:30:00Z")
230+
assert DatetimeVersion("2023-10-28T19:30:00+01:00") == DatetimeVersion("2023-10-28T18:30:00Z")

0 commit comments

Comments
 (0)