Skip to content

Commit

Permalink
Move scos-sensor version to settings
Browse files Browse the repository at this point in the history
  • Loading branch information
aromanielloNTIA committed Sep 8, 2023
1 parent 70f6890 commit 18dcf42
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion scos_actions/actions/acquire_sea_data_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
ntia_sensor,
)
from scos_actions.metadata.structs.capture import CaptureSegment
from scos_actions.settings import SCOS_SENSOR_GIT_TAG
from scos_actions.signal_processing.apd import get_apd
from scos_actions.signal_processing.fft import (
get_fft,
Expand Down Expand Up @@ -793,7 +794,7 @@ def capture_diagnostics(self, action_start_tic: float, cpu_speeds: list) -> None
software_diag = {
"system_platform": platform.platform(),
"python_version": sys.version.split()[0],
"scos_sensor_version": env("SCOS_SENSOR_GIT_TAG", "unknown"),
"scos_sensor_version": SCOS_SENSOR_GIT_TAG,
"scos_actions_version": SCOS_ACTIONS_VERSION,
"preselector_api_version": PRESELECTOR_API_VERSION,
}
Expand Down
4 changes: 2 additions & 2 deletions scos_actions/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
SIGAN_POWER_CYCLE_STATES = env("SIGAN_POWER_CYCLE_STATES", default=None)
SIGAN_POWER_SWITCH = env("SIGAN_POWER_SWITCH", default=None)
MOCK_SIGAN = env("MOCK_SIGAN", default=None)


SCOS_SENSOR_GIT_TAG = env("SCOS_SENSOR_GIT_TAG", default="unknown")
else:
MOCK_SIGAN = settings.MOCK_SIGAN
RUNNING_TESTS = settings.RUNNING_TESTS
SENSOR_DEFINITION_FILE = Path(settings.SENSOR_DEFINITION_FILE)
FQDN = settings.FQDN
SCOS_SENSOR_GIT_TAG = settings.SCOS_SENSOR_GIT_TAG
if settings.PRESELECTOR_CONFIG:
PRESELECTOR_CONFIG_FILE = settings.PRESELECTOR_CONFIG
else:
Expand Down

0 comments on commit 18dcf42

Please sign in to comment.