From 44efa8a3b4dd0aa56f25d28185fb18bd23b4bba9 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 28 Apr 2020 13:01:16 +0200 Subject: [PATCH 1/6] prepare release --- CHANGELOG.md | 6 +----- includes/globalVars.py | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1efabf..176f30b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,12 @@ # Changelog -### __[v2.5.1]__ - unreleased +### __[v2.5.1]__ - 28.04.2020 ##### Added - Plugin requirements: Added requirements.txt for all plugins requiring extra python packages so the install will be easier - DescriptionList POC: add new description parameter for Sub-RICs without a main RIC definition. parameter 'onlysubric'. [#449](https://github.com/Schrolli91/BOSWatch/pull/449) -##### Changed -##### Deprecated -##### Removed ##### Fixed - MySQL plugin: Ensure character set (utf8mb4) and collation (utf8mb4_general_ci) are set correctly when connection to database is established. [#447](https://github.com/Schrolli91/BOSWatch/pull/447) - E-Mail plugin: Create MIME-compliant header that can contain any kind of string. [#448](https://github.com/Schrolli91/BOSWatch/pull/448) -##### Security ### __[v2.5]__ - 16.04.2020 diff --git a/includes/globalVars.py b/includes/globalVars.py index 0a8045c..05a1808 100644 --- a/includes/globalVars.py +++ b/includes/globalVars.py @@ -10,8 +10,8 @@ Global variables # version info versionNr = "2.5.1" -branch = "dev" -buildDate = "unreleased" +branch = "master" +buildDate = "28.04.2020" # Global variables config = 0 From d9176db476e4c82401a7878d0925ffc9a148cfc6 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 28 Apr 2020 13:05:12 +0200 Subject: [PATCH 2/6] fix CL --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 176f30b..b72530e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### __[v2.5.1]__ - 28.04.2020 ##### Added -- Plugin requirements: Added requirements.txt for all plugins requiring extra python packages so the install will be easier +- Plugin requirements: Added requirements.txt for all plugins requiring extra python packages so the install will be easier [#446](https://github.com/Schrolli91/BOSWatch/pull/446) - DescriptionList POC: add new description parameter for Sub-RICs without a main RIC definition. parameter 'onlysubric'. [#449](https://github.com/Schrolli91/BOSWatch/pull/449) ##### Fixed - MySQL plugin: Ensure character set (utf8mb4) and collation (utf8mb4_general_ci) are set correctly when connection to database is established. [#447](https://github.com/Schrolli91/BOSWatch/pull/447) From 28e9a9117379956ff24d87d73d3c1609fdc4eb46 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 28 Jul 2020 23:35:17 +0200 Subject: [PATCH 3/6] Update gpiocontrol.py Fixing indentation-error reported on #458 --- plugins/gpiocontrol/gpiocontrol.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/gpiocontrol/gpiocontrol.py b/plugins/gpiocontrol/gpiocontrol.py index 7662fe8..f7daf90 100644 --- a/plugins/gpiocontrol/gpiocontrol.py +++ b/plugins/gpiocontrol/gpiocontrol.py @@ -92,9 +92,9 @@ def run(typ,freq,data): #logging.warning("%s not supported", typ) elif typ == "POC": if globalVars.config.get("gpiocontrol", "activerics") == "": - th = threading.Thread(target = trigger) - th.start() - else + th = threading.Thread(target = trigger) + th.start() + else: if data["ric"] in globalVars.config.get("gpiocontrol", "activerics"): th = threading.Thread(target = trigger) th.start() From d75800e8d3a0865172ea1252827de0684cc9004f Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 1 Aug 2020 12:43:35 +0200 Subject: [PATCH 4/6] Fixing another indentation error Fixing various errors and adding changelog --- CHANGELOG.md | 4 ++++ plugins/gpiocontrol/gpiocontrol.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b72530e..16fbc11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### __[v2.5.2]__ - 01.08.2020 +##### Fixed +- GPIOcontrol plugin: Fixing indentation errors. [#465](https://github.com/Schrolli91/BOSWatch/pull/465) + ### __[v2.5.1]__ - 28.04.2020 ##### Added - Plugin requirements: Added requirements.txt for all plugins requiring extra python packages so the install will be easier [#446](https://github.com/Schrolli91/BOSWatch/pull/446) diff --git a/plugins/gpiocontrol/gpiocontrol.py b/plugins/gpiocontrol/gpiocontrol.py index f7daf90..63334d1 100644 --- a/plugins/gpiocontrol/gpiocontrol.py +++ b/plugins/gpiocontrol/gpiocontrol.py @@ -92,14 +92,14 @@ def run(typ,freq,data): #logging.warning("%s not supported", typ) elif typ == "POC": if globalVars.config.get("gpiocontrol", "activerics") == "": - th = threading.Thread(target = trigger) - th.start() - else: - if data["ric"] in globalVars.config.get("gpiocontrol", "activerics"): - th = threading.Thread(target = trigger) - th.start() - else: - logging.info("Ric not in activerics") + th = threading.Thread(target = trigger) + th.start() + else: + if data["ric"] in globalVars.config.get("gpiocontrol", "activerics"): + th = threading.Thread(target = trigger) + th.start() + else: + logging.info("Ric not in activerics") else: logging.warning("Invalid Typ: %s", typ) ########## User Plugin CODE ########## From e582c4a03033bc13de81307e8b84f9afa25d0418 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Mon, 3 Aug 2020 14:27:17 +0200 Subject: [PATCH 5/6] Update globalVars.py --- includes/globalVars.py | 1 - 1 file changed, 1 deletion(-) diff --git a/includes/globalVars.py b/includes/globalVars.py index 526ead2..b0b50fb 100644 --- a/includes/globalVars.py +++ b/includes/globalVars.py @@ -13,7 +13,6 @@ versionNr = "2.5.2" branch = "dev" buildDate = "unreleased" - # Global variables config = 0 script_path = "" From 3fd9e92bcdec47e2cc723107a1b869a9e79c4145 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Mon, 3 Aug 2020 14:27:30 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a2e6e0..53dbf32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,5 @@ # Changelog - ### __[v2.5.2]__ - unreleased ##### Added - fhemCmd-Plugin: New plugin fhemCmd to execute commands in FHEM home automation. [#457](https://github.com/Schrolli91/BOSWatch/pull/457)