Merge pull request #452 from Der-Henning/dev

Bump Version 1.20.1

Author: Der-Henning

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
     args: [--profile, black]
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 6.1.0
+  rev: 7.0.0
   hooks:
   - id: flake8
     args: [--max-line-length, '130']

poetry.lock

@@ -12,7 +12,7 @@ name = "tgtg-scanner"
 packages = [{include = "tgtg_scanner"}]
 readme = "README.md"
 repository = "https://github.com/Der-Henning/tgtg"
-version = "1.20.0"
+version = "1.20.1"
 
 [tool.poetry.dependencies]
 apprise = "^1.4.0"
@@ -32,10 +32,6 @@ requests = "^2.31.0"
 [tool.poetry.group.build.dependencies]
 pyinstaller = "^6.3.0"
 
-[tool.poetry.group.dev.dependencies]
-ipykernel = "^6.25.1"
-notebook = "^7.0.6"
-
 [tool.poetry.group.test.dependencies]
 pre-commit = "^3.3.3"
 pytest = "^7.4.0"

pyproject.toml

@@ -187,6 +187,7 @@ pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "3.13" \
     --hash=sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4 \
     --hash=sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba \
     --hash=sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8 \
+    --hash=sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef \
     --hash=sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5 \
     --hash=sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd \
     --hash=sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3 \

requirements.txt

@@ -209,9 +209,21 @@ def _read_ini(self, parser: configparser.ConfigParser):
         self._ini_get(parser, "PUSHSAFER", "DeviceID", "device_id")
 
     def _read_env(self):
+        if environ.get("PUSH_SAFER", None):
+            log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER", "PUSHSAFER"))
+        self._env_get_boolean("PUSH_SAFER", "enabled")
         self._env_get_boolean("PUSHSAFER", "enabled")
+        if environ.get("PUSH_SAFER_CRON", None):
+            log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER_CRON", "PUSHSAFER_CRON"))
+        self._env_get_cron("PUSH_SAFER_CRON", "cron")
         self._env_get_cron("PUSHSAFER_CRON", "cron")
+        if environ.get("PUSH_SAFER_KEY", None):
+            log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER_KEY", "PUSHSAFER_KEY"))
+        self._env_get("PUSH_SAFER_KEY", "key")
         self._env_get("PUSHSAFER_KEY", "key")
+        if environ.get("PUSH_SAFER_DEVICE_ID", None):
+            log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER_DEVICE_ID", "PUSHSAFER_DEVICE_ID"))
+        self._env_get("PUSH_SAFER_DEVICE_ID", "device_id")
         self._env_get("PUSHSAFER_DEVICE_ID", "device_id")
 
 

tgtg_scanner/models/config.py

@@ -132,10 +132,10 @@ You can combine multiple crons as semicolon separated list.
 
 | config.ini | environment | description | default | required if enabled | variables |
 |------------|-------------|-------------|---------|:-------------------:|:---------:|
-| Enabled | PUSH_SAFER | enable Pushsafer notifications | `false` |
-| Key | PUSH_SAFER_KEY | Pushsafer API key | | YES |
-| DeviceID | PUSH_SAFER_DEVICE_ID | Pushsafer device ID | | YES |
-| Cron | PUSH_SAFER_CRON | enable notification only on schedule | `* * * * *` |
+| Enabled | PUSHSAFER | enable Pushsafer notifications | `false` |
+| Key | PUSHSAFER_KEY | Pushsafer API key | | YES |
+| DeviceID | PUSHSAFER_DEVICE_ID | Pushsafer device ID | | YES |
+| Cron | PUSHSAFER_CRON | enable notification only on schedule | `* * * * *` |
 
 ### [IFTTT] / IFTTT Notifier