diff --git a/deps/tmtccmd b/deps/tmtccmd index ad8f049..e5e62c9 160000 --- a/deps/tmtccmd +++ b/deps/tmtccmd @@ -1 +1 @@ -Subproject commit ad8f049d6605b0e63afde774d3cadd80b2392051 +Subproject commit e5e62c9a658fcfc9345e0e3eb66038cc8648955e diff --git a/eive_tmtc/__init__.py b/eive_tmtc/__init__.py index 96b04b4..ababc6f 100644 --- a/eive_tmtc/__init__.py +++ b/eive_tmtc/__init__.py @@ -1,6 +1,11 @@ +from pathlib import Path + SW_NAME = "eive-tmtc" VERSION_MAJOR = 2 VERSION_MINOR = 0 -VERSION_REVISION = 1 +VERSION_REVISION = 2 -__version__ = "2.0.1" +__version__ = "2.0.2" + +EIVE_TMTC_ROOT = Path(__file__).parent +PACKAGE_ROOT = EIVE_TMTC_ROOT.parent diff --git a/eive_tmtc/config/definitions.py b/eive_tmtc/config/definitions.py index 6a849ea..30836fd 100644 --- a/eive_tmtc/config/definitions.py +++ b/eive_tmtc/config/definitions.py @@ -11,8 +11,6 @@ from spacepackets.ccsds import PacketId from spacepackets.util import UnsignedByteField from pathlib import Path -EIVE_TMTC_ROOT = Path(__file__).parent -PACKAGE_ROOT = EIVE_TMTC_ROOT.parent PUS_APID = 0x65 CFDP_APID = 0x66 diff --git a/eive_tmtc/config/events.py b/eive_tmtc/config/events.py index f1cc723..2591343 100644 --- a/eive_tmtc/config/events.py +++ b/eive_tmtc/config/events.py @@ -1,6 +1,6 @@ import os -from eive_tmtc.config.definitions import EIVE_TMTC_ROOT +from eive_tmtc import EIVE_TMTC_ROOT from tmtccmd import get_console_logger from tmtccmd.fsfw import parse_fsfw_events_csv from tmtccmd.pus.pus_5_event import EventDictT diff --git a/eive_tmtc/config/object_ids.py b/eive_tmtc/config/object_ids.py index 150ba17..e022b52 100644 --- a/eive_tmtc/config/object_ids.py +++ b/eive_tmtc/config/object_ids.py @@ -5,7 +5,7 @@ """ import os.path -from eive_tmtc.config.definitions import EIVE_TMTC_ROOT +from eive_tmtc import EIVE_TMTC_ROOT from tmtccmd.util.obj_id import ObjectIdDictT from tmtccmd.fsfw import parse_fsfw_objects_csv from tmtccmd.logging import get_console_logger diff --git a/eive_tmtc/config/retvals.py b/eive_tmtc/config/retvals.py index 47d9529..4750f0f 100644 --- a/eive_tmtc/config/retvals.py +++ b/eive_tmtc/config/retvals.py @@ -1,6 +1,6 @@ import os -from eive_tmtc.config.definitions import EIVE_TMTC_ROOT +from eive_tmtc import EIVE_TMTC_ROOT from tmtccmd.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT from tmtccmd.logging import get_console_logger diff --git a/setup.cfg b/setup.cfg index ba07f66..63e418e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ classifiers = [options] install_requires = - tmtccmd >= 3.0.0rc2 + tmtccmd >= 3.0.0rc3 packages = find: python_requires = >=3.8