refactor: remove version class

sportorg · Jun 23, 2024 · dc7f17e · dc7f17e
1 parent 03abf98
commit dc7f17e
Show file tree

Hide file tree

Showing 8 changed files with 180 additions and 295 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/setup.cfg b/setup.cfg
@@ -63,4 +63,4 @@ branch = True
 [coverage:report]
 show_missing = True
 skip_covered = True
-fail_under = 43
+fail_under = 42
diff --git a/sportorg/common/version.py b/sportorg/common/version.py
diff --git a/sportorg/config.py b/sportorg/config.py
@@ -4,8 +4,6 @@
 
 from pydantic import BaseSettings
 
-from sportorg.common.version import Version
-
 
 class Env(BaseSettings):
     DEBUG: bool = False
@@ -15,7 +13,8 @@ class Config:
 
 
 NAME = 'SportOrg'
-VERSION = Version(1, 6, 0, 0, 'v')
+VERSION = 'v1.6.0'
+VERSION_FULL = '1.6.0.0'
 
 
 def is_executable() -> bool:

diff --git a/sportorg/modules/backup/json.py b/sportorg/modules/backup/json.py
@@ -20,7 +20,7 @@
 
 def dump(file):
     data = {
-        'version': config.VERSION.file,
+        'version': config.VERSION_FULL,
         'current_race': get_current_race_index(),
         'races': [race_downgrade(r.to_dict()) for r in races()],
     }

diff --git a/sportorg/modules/updater/checker.py b/sportorg/modules/updater/checker.py
@@ -22,7 +22,7 @@ def get_version():
     return VERSION
 
 
-def check_version(version):
+def check_version(version: str) -> bool:
     if not get_version():
         return True
     return str(version) == get_version()
diff --git a/tests/test_iss.py b/tests/test_iss.py
@@ -20,6 +20,6 @@ def test_app_version(data):
 def test_version_info(data):
     for item in data:
         if '#define MyVersionInfoVersion ' in item:
-            assert config.VERSION.file in item
+            assert config.VERSION_FULL in item
             return
     assert False, 'Not version info'
diff --git a/tests/test_version.py b/tests/test_version.py