From e7067cbb74ff8cc6eab89d276832b6bafba7761d Mon Sep 17 00:00:00 2001 From: David Tekan Date: Tue, 12 Sep 2023 21:45:43 +0200 Subject: [PATCH 1/3] small help fix, update requirements --- paradox/config.py | 7 +++---- paradox/lib/help.py | 14 ++++++++++++-- requirements.txt | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/paradox/config.py b/paradox/config.py index ea41c65..b88bbaa 100644 --- a/paradox/config.py +++ b/paradox/config.py @@ -343,10 +343,9 @@ def load(self, alt_location=None): if valid: setattr(self, k, v) else: - err = "Error parsing configuration value: Invalid value for config argument {}. Allowed are: {}".format( - type(v), k, expected_value - ) - sys.stderr.write(err + "\n") + err = "Error parsing configuration value: Invalid value for config argument {} (type {}). Allowed are in: {}".format( + k, type(v), expected_value + ) sys.stderr.write(err + "\n") raise (Exception(err)) self.CONFIG_LOADED = True diff --git a/paradox/lib/help.py b/paradox/lib/help.py index 9503154..ee16fab 100644 --- a/paradox/lib/help.py +++ b/paradox/lib/help.py @@ -33,14 +33,24 @@ "ws4py": dict( mandatory=False, desc="the Pushbullet interface", install_name="ws4py>=0.4.2" ), - "yaml": dict(mandatory=False, desc="the IP150 connection", install_name="yaml"), + "yaml": dict(mandatory=False, desc="the IP150 connection", install_name="pyyaml>=5.2.0"), "chump": dict( mandatory=False, desc="the Pushover interface", install_name="chump>=1.6.0" ), "pydbus": dict( mandatory=False, desc="the Signal interface", install_name="pydbus>=0.6.0" ), + "pygobject": dict( + mandatory=False, desc="the Signal interface", install_name="pygobject>=3.20.0" + ), "gi": dict(mandatory=False, desc="the Signal interface", install_name="gi>=1.2"), + "pytz": dict(mandatory=False, desc="Panel time sync", install_name="pytz>=2023.3.post1"), + "mqtt": dict(mandatory=False, desc="MQTT", install_name="paho_mqtt>=1.5.0"), + "chump": dict(mandatory=False, desc="Pushover notification", install_name="chump>=1.6.0"), + + "pre-commit": dict(mandatory=False, desc="Development", install_name="pre-commit"), + "flake8": dict(mandatory=False, desc="Code checker", install_name="flake8"), + "tox": dict(mandatory=False, desc="virtual env / testing", install_name="tox"), } @@ -65,7 +75,7 @@ def import_error_help(error): logger.error( "To install ALL modules required, go to the main project folder and execute:\n" ) - logger.error(" pip3 -r requirements.txt\n") + logger.error(" pip3 install -r requirements.txt\n") logger.error( "Take in consideration that the 'requirements.txt' file only has the most common modules enabled." ) diff --git a/requirements.txt b/requirements.txt index 8546fcc..3a02efd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ pushbullet.py>=0.11.0 pyserial>=3.4 pyserial-asyncio>=0.4 python-slugify>=4.0.1 -pytz>=2021.3 +pytz>=2023.3.post1 # Signal support # pygobject>=3.20.0 # pydbus>=0.6.0 From b9a1b770806c1099cd5fa57b556191c84e561a02 Mon Sep 17 00:00:00 2001 From: David Tekan Date: Tue, 12 Sep 2023 21:47:22 +0200 Subject: [PATCH 2/3] line break --- paradox/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paradox/config.py b/paradox/config.py index b88bbaa..cef1122 100644 --- a/paradox/config.py +++ b/paradox/config.py @@ -345,7 +345,8 @@ def load(self, alt_location=None): else: err = "Error parsing configuration value: Invalid value for config argument {} (type {}). Allowed are in: {}".format( k, type(v), expected_value - ) sys.stderr.write(err + "\n") + ) + sys.stderr.write(err + "\n") raise (Exception(err)) self.CONFIG_LOADED = True From 4c20ab2af4c463eca8781ec14ebb3cff63a40177 Mon Sep 17 00:00:00 2001 From: David Tekan Date: Tue, 12 Sep 2023 21:52:07 +0200 Subject: [PATCH 3/3] remove duplicate chump --- paradox/lib/help.py | 1 - 1 file changed, 1 deletion(-) diff --git a/paradox/lib/help.py b/paradox/lib/help.py index ee16fab..46da836 100644 --- a/paradox/lib/help.py +++ b/paradox/lib/help.py @@ -46,7 +46,6 @@ "gi": dict(mandatory=False, desc="the Signal interface", install_name="gi>=1.2"), "pytz": dict(mandatory=False, desc="Panel time sync", install_name="pytz>=2023.3.post1"), "mqtt": dict(mandatory=False, desc="MQTT", install_name="paho_mqtt>=1.5.0"), - "chump": dict(mandatory=False, desc="Pushover notification", install_name="chump>=1.6.0"), "pre-commit": dict(mandatory=False, desc="Development", install_name="pre-commit"), "flake8": dict(mandatory=False, desc="Code checker", install_name="flake8"),