Merge pull request #300 from Der-Henning/dev

Bugfix: Add Apprise to executable

.github/pull_request_template.md

@@ -4,8 +4,8 @@
 * [ ] Did you make your Pull Request on the dev branch?
 * [ ] Does your submission pass tests? `make test`
 * [ ] Have you lint your code locally prior to submission? `make lint`
-* [ ] Could you build and run the docker image sucessfully? `make image`
+* [ ] Could you build and run the docker image successfully? `make image`
 * [ ] Could you create a running executable? `make executable`
 * [ ] Have you added an explanation of what your changes do and why you'd like to include them?
 * [ ] Have you written new tests for your changes, as applicable?
-* [ ] Have you successfully ran tests with your changes locally?
+* [ ] Have you successfully ran manual tests with your changes locally?

DOCKER_README.md

@@ -10,8 +10,8 @@ Readme, source, and documentation on [https://github.com/Der-Henning/tgtg](https
 
 - [`edge`](https://github.com/Der-Henning/tgtg/blob/main/Dockerfile)
 - [`edge-alpine`](https://github.com/Der-Henning/tgtg/blob/main/Dockerfile.alpine)
-- [`v1`, `v1.16`, `v1.16.0`, `latest`](https://github.com/Der-Henning/tgtg/blob/v1.16.0/Dockerfile)
-- [`v1-alpine`, `v1.16-alpine`, `v1.16.0-alpine`, `latest-alpine`](https://github.com/Der-Henning/tgtg/blob/v1.16.0/Dockerfile.alpine)
+- [`v1`, `v1.16`, `v1.16.1`, `latest`](https://github.com/Der-Henning/tgtg/blob/v1.16.1/Dockerfile)
+- [`v1-alpine`, `v1.16-alpine`, `v1.16.1-alpine`, `latest-alpine`](https://github.com/Der-Henning/tgtg/blob/v1.16.1/Dockerfile.alpine)
 
 # Quick Start
 

scanner.spec

@@ -4,6 +4,7 @@ from PyInstaller.utils.hooks import collect_data_files
 datas = []
 datas += collect_data_files('cron_descriptor')
 datas += collect_data_files('humanize')
+datas += collect_data_files('apprise')
 
 
 block_cipher = None

src/_version.py

@@ -1,6 +1,6 @@
 __title__ = "TGTG Scanner"
 __description__ = "Provides notifications for TGTG magic bags"
-__version__ = "1.16.0"
+__version__ = "1.16.1"
 __author__ = "Henning Merklinger"
 __author_email__ = "henning.merklinger@gmail.com"
 __license__ = "GPL"

src/models/config.py

@@ -456,7 +456,7 @@ def _read_env(self) -> None:
             self._env_get_int("IFTTT_TIMEOUT", "ifttt.timeout")
             self._env_get_cron("IFTTT_CRON", "ifttt.cron")
 
-            self._env_get_boolean("NTFY_ENABLED", "ntfy.enabled")
+            self._env_get_boolean("NTFY", "ntfy.enabled")
             self._env_get("NTFY_SERVER", "ntfy.server")
             self._env_get("NTFY_TOPIC", "ntfy.topic")
             self._env_get("NTFY_TITLE", "ntfy.title")