Skip to content

Commit 39f6f4e

Browse files
committed
Rename SemanticVersion to ParsedVersion
1 parent 25686a4 commit 39f6f4e

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

pupil_src/shared_modules/pupil_recording/info/recording_info.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import typing as T
1919
import uuid
2020

21-
from version_utils import get_version, parse_version, SemanticVersion
21+
from version_utils import get_version, parse_version, ParsedVersion
2222

2323

2424
__all__ = ["RecordingInfo", "RecordingInfoFile", "RecordingInfoInvalidError"]
@@ -71,12 +71,12 @@ def __len__(self):
7171

7272
@property
7373
@abc.abstractmethod
74-
def meta_version(self) -> SemanticVersion:
74+
def meta_version(self) -> ParsedVersion:
7575
pass
7676

7777
@property
7878
@abc.abstractmethod
79-
def min_player_version(self) -> SemanticVersion:
79+
def min_player_version(self) -> ParsedVersion:
8080
pass
8181

8282
@property
@@ -376,7 +376,7 @@ def does_recording_contain_info_file(rec_dir: str) -> bool:
376376
return os.path.isfile(file_path)
377377

378378
@staticmethod
379-
def detect_recording_info_file_version(rec_dir: str) -> SemanticVersion:
379+
def detect_recording_info_file_version(rec_dir: str) -> ParsedVersion:
380380
file_path = RecordingInfoFile._info_file_path(rec_dir=rec_dir)
381381
with open(file_path, "r") as file:
382382
read_dict = RecordingInfoFile._read_dict_from_file(file=file)
@@ -437,7 +437,7 @@ def read_file_from_recording(rec_dir: str) -> "RecordingInfoFile":
437437

438438
@staticmethod
439439
def create_empty_file(
440-
rec_dir: str, fixed_version: T.Optional[SemanticVersion] = None
440+
rec_dir: str, fixed_version: T.Optional[ParsedVersion] = None
441441
) -> "RecordingInfoFile":
442442
"""
443443
Creates a new `RecordingInfoFile` instance using the latest meta format version,
@@ -480,15 +480,15 @@ def validate(self):
480480
_info_file_versions = {}
481481

482482
@classmethod
483-
def register_child_class(cls, version: SemanticVersion, child_class: type):
483+
def register_child_class(cls, version: ParsedVersion, child_class: type):
484484
"""Use this to register interface implementations for specific versions."""
485485
# NOTE: This is dependency inversion to avoids circular imports, because we
486486
# don't need to know our child classes.
487487
# TODO: Would be much cleaner with self-registering meta classes.
488488
cls._info_file_versions[version] = child_class
489489

490490
@classmethod
491-
def get_latest_info_file_version(cls) -> SemanticVersion:
491+
def get_latest_info_file_version(cls) -> ParsedVersion:
492492
if not cls._info_file_versions:
493493
raise ValueError(
494494
"RecordingInfoFile not correctly initialized! No templates registered."

pupil_src/shared_modules/pupil_recording/info/recording_info_2_0.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313

1414
from . import RecordingInfoFile
1515
from . import recording_info_utils as utils
16-
from version_utils import parse_version, SemanticVersion
16+
from version_utils import parse_version, ParsedVersion
1717

1818

1919
class _RecordingInfoFile_2_0(RecordingInfoFile):
2020

2121
# RecordingInfo
2222

2323
@property
24-
def meta_version(self) -> SemanticVersion:
24+
def meta_version(self) -> ParsedVersion:
2525
return parse_version("2.0")
2626

2727
@property
28-
def min_player_version(self) -> SemanticVersion:
28+
def min_player_version(self) -> ParsedVersion:
2929
return parse_version("1.16")
3030

3131
@property

pupil_src/shared_modules/pupil_recording/info/recording_info_2_1.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from . import RecordingInfoFile
1313
from .recording_info_2_0 import _RecordingInfoFile_2_0
1414
from . import recording_info_utils as utils
15-
from version_utils import parse_version, SemanticVersion
15+
from version_utils import parse_version, ParsedVersion
1616

1717

1818
class _RecordingInfoFile_2_1(_RecordingInfoFile_2_0):
@@ -24,7 +24,7 @@ class _RecordingInfoFile_2_1(_RecordingInfoFile_2_0):
2424
# meta version 2.0 have to be re-transformed.
2525

2626
@property
27-
def meta_version(self) -> SemanticVersion:
27+
def meta_version(self) -> ParsedVersion:
2828
return parse_version("2.1")
2929

3030
@property

pupil_src/shared_modules/pupil_recording/info/recording_info_2_2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
from . import RecordingInfoFile
1313
from .recording_info_2_0 import _RecordingInfoFile_2_0
1414
from . import recording_info_utils as utils
15-
from version_utils import parse_version, SemanticVersion
15+
from version_utils import parse_version, ParsedVersion
1616

1717

1818
class _RecordingInfoFile_2_2(_RecordingInfoFile_2_0):
1919

2020
# Used to make Pupil v2.0 recordings backwards incompatible with v1.*
2121

2222
@property
23-
def meta_version(self) -> SemanticVersion:
23+
def meta_version(self) -> ParsedVersion:
2424
return parse_version("2.2")
2525

2626
@property
27-
def min_player_version(self) -> SemanticVersion:
27+
def min_player_version(self) -> ParsedVersion:
2828
return parse_version("2.0")
2929

3030
@property

pupil_src/shared_modules/pupil_recording/info/recording_info_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
from methods import get_system_info
1919

2020
from .recording_info import RecordingInfoFile
21-
from version_utils import parse_version, SemanticVersion
21+
from version_utils import parse_version, ParsedVersion
2222

2323

24-
def string_from_recording_version(value: SemanticVersion) -> str:
24+
def string_from_recording_version(value: ParsedVersion) -> str:
2525
return str(value) # TODO: Make sure this conversion is correct
2626

2727

pupil_src/shared_modules/version_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ def get_tag_commit() -> T.Optional[T.AnyStr]:
3434
return None
3535

3636

37-
SemanticVersion = T.Union[packaging.version.LegacyVersion, packaging.version.Version]
37+
ParsedVersion = T.Union[packaging.version.LegacyVersion, packaging.version.Version]
3838

3939

40-
def parse_version(vstring) -> SemanticVersion:
40+
def parse_version(vstring) -> ParsedVersion:
4141
return packaging.version.parse(vstring)
4242

4343

44-
def pupil_version() -> SemanticVersion:
44+
def pupil_version() -> ParsedVersion:
4545
return parse_version(pupil_version_string())
4646

4747

0 commit comments

Comments
 (0)