Skip to content

Commit

Permalink
Merge pull request #452 from Der-Henning/dev
Browse files Browse the repository at this point in the history
Bump Version 1.20.1
  • Loading branch information
Der-Henning authored Jan 22, 2024
2 parents 25b4477 + c6ff929 commit 363b444
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 1,743 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
1,820 changes: 87 additions & 1,733 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 12 additions & 0 deletions tgtg_scanner/models/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")


Expand Down
8 changes: 4 additions & 4 deletions wiki/Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 363b444

Please sign in to comment.