From 34fa8f4582dc71e0ba926cc199ebdb393c9c4f6e Mon Sep 17 00:00:00 2001 From: Alex Greenland Date: Thu, 7 Dec 2023 20:21:44 +0000 Subject: [PATCH] Add missing modules --- config_repo/requirements-32.txt | 1 + config_repo/requirements-64.txt | 1 + config_repo/requirements-bookworm-32.txt | 1 + config_repo/requirements-bookworm-64.txt | 1 + scripts/modules/allsky_overlay.py | 4 +++- 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config_repo/requirements-32.txt b/config_repo/requirements-32.txt index d8caf04fc..9e083486d 100644 --- a/config_repo/requirements-32.txt +++ b/config_repo/requirements-32.txt @@ -7,6 +7,7 @@ astral pytz scipy<=1.8.1 paho-mqtt +scikit-image photutils astropy suncalc diff --git a/config_repo/requirements-64.txt b/config_repo/requirements-64.txt index 685b872f3..7cd25113f 100644 --- a/config_repo/requirements-64.txt +++ b/config_repo/requirements-64.txt @@ -7,6 +7,7 @@ astral pytz scipy paho-mqtt +scikit-image photutils astropy suncalc diff --git a/config_repo/requirements-bookworm-32.txt b/config_repo/requirements-bookworm-32.txt index b011884a3..f16583c2a 100644 --- a/config_repo/requirements-bookworm-32.txt +++ b/config_repo/requirements-bookworm-32.txt @@ -7,6 +7,7 @@ astral pytz scipy<=1.11.3 paho-mqtt +scikit-image photutils astropy suncalc diff --git a/config_repo/requirements-bookworm-64.txt b/config_repo/requirements-bookworm-64.txt index 685b872f3..7cd25113f 100644 --- a/config_repo/requirements-bookworm-64.txt +++ b/config_repo/requirements-bookworm-64.txt @@ -7,6 +7,7 @@ astral pytz scipy paho-mqtt +scikit-image photutils astropy suncalc diff --git a/scripts/modules/allsky_overlay.py b/scripts/modules/allsky_overlay.py index 50649bd21..64b34ab29 100644 --- a/scripts/modules/allsky_overlay.py +++ b/scripts/modules/allsky_overlay.py @@ -782,7 +782,9 @@ def _getValue(self, placeHolder, variableType, format=None, empty=''): s.log(4, "WARNING: data field {0} expired. File time {1}, now {2}. Expiry {3} Seconds. Age {4} Seconds" .format(placeHolder, fileTimeHR, nowTimeHR, self._extraData[envCheck]["expires"], age)) valueOk = False - expiredText = self._overlayConfig["settings"]["defaultexpirytext"] + expiredText = '' + if 'defaultexpirytext' in self._overlayConfig["settings"]: + expiredText = self._overlayConfig["settings"]["defaultexpirytext"] if expiredText != "": value = expiredText