Skip to content

Commit f16079e

Browse files
fix version
1 parent aa9fff6 commit f16079e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

pioreactor/version.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,15 @@ def tuple_to_text(t: tuple) -> str:
8181
return ".".join(map(str, t))
8282

8383

84-
def version_text_to_tuple(s: str) -> tuple[int, int] | tuple[int, int, int]:
85-
if len(s.split(".")) == 3:
86-
major, minor, patch = map(int, s.split("."))
87-
return (major, minor, patch)
88-
else:
89-
major, minor = map(int, s.split("."))
90-
return (major, minor)
84+
def version_text_to_tuple(s: str) -> tuple[int, int]:
85+
return tuple((safe_int(_) for _ in s.split("."))) # type: ignore
86+
87+
88+
def safe_int(s) -> int:
89+
try:
90+
return int(s)
91+
except (ValueError, TypeError):
92+
return s
9193

9294

9395
hardware_version_info = get_hardware_version()

pioreactor/whoami.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def am_I_a_worker() -> bool:
153153

154154

155155
@cache
156-
def get_pioreactor_version() -> tuple[int, int, *tuple[int, ...]]:
156+
def get_pioreactor_version() -> tuple[int, int]:
157157
# pioreactor model version
158158
if os.environ.get("MODEL_VERSION"):
159159
return version_text_to_tuple(os.environ["MODEL_VERSION"])

0 commit comments

Comments
 (0)