Merge pull request #475 from Der-Henning/dev

update dependencies

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
 			"VARIANT": "3.11",
 			// Options
 			// "NODE_VERSION": "lts/*",
-			"POETRY_VERSION": "1.7.1"
+			"POETRY_VERSION": "1.8.2"
 		}
 	},
 	// Set *default* container specific settings.json values on container create.

.github/workflows/dependabot.yml

@@ -14,7 +14,7 @@ on:
 
 env:
   PYTHON_VERSION: '3.11'
-  POETRY_VERSION: 1.7.1
+  POETRY_VERSION: 1.8.2
 
 jobs:
   run:

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   PYTHON_VERSION: '3.11'
-  POETRY_VERSION: 1.7.1
+  POETRY_VERSION: 1.8.2
 
 jobs:
   docker-images:
@@ -108,13 +108,22 @@ jobs:
         poetry-version: ${{ env.POETRY_VERSION }}
         python-version: ${{ env.PYTHON_VERSION }}
         without: test
-    - name: Run PyInstaller
+    - name: Run PyInstaller (linux/macos)
+      if: matrix.tag == 'linux' || matrix.tag == 'macos'
       run: |
         poetry run pyinstaller scanner.spec
         cp ./config.sample.ini ./dist/config.ini
         cp ./README.md ./dist/README.md
         cp ./LICENSE ./dist/LICENSE
         ./dist/scanner -v
+    - name: Run PyInstaller (win)
+      if: matrix.tag == 'win'
+      run: |
+        poetry run pyinstaller scanner_win.spec
+        cp ./config.sample.ini ./dist/scanner/config.ini
+        cp ./README.md ./dist/scanner/README.md
+        cp ./LICENSE ./dist/scanner/LICENSE
+        ./dist/scanner/scanner -v
     - name: Make filename for archive
       id: filename
       shell: bash
@@ -124,7 +133,7 @@ jobs:
       run: zip -j ./${{ steps.filename.outputs.FILENAME }} ./dist/*
     - name: Zip files (win)
       if: matrix.tag == 'win'
-      run: Compress-Archive ./dist/* ./${{ steps.filename.outputs.FILENAME }}
+      run: Compress-Archive ./dist/scanner/* ./${{ steps.filename.outputs.FILENAME }}
     - name: Upload archive
       uses: actions/upload-artifact@v4
       with:

.github/workflows/tests.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  POETRY_VERSION: 1.7.1
+  POETRY_VERSION: 1.8.2
 
 jobs:
   tests:
@@ -30,4 +30,4 @@ jobs:
       run: poetry run pre-commit run -a
     - name: Run tests
       run: poetry run pytest -v -m "not tgtg_api" --cov=tgtg_scanner --cov-report=xml
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v4

.github/workflows/tgtg.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   PYTHON_VERSION: '3.11'
-  POETRY_VERSION: 1.7.1
+  POETRY_VERSION: 1.8.2
 
 jobs:
   test:

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: (build|dist)
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v4.6.0
   hooks:
   - id: trailing-whitespace
   - id: check-added-large-files
@@ -13,7 +13,7 @@ repos:
   - id: check-added-large-files
 
 - repo: https://github.com/ambv/black
-  rev: 24.2.0
+  rev: 24.4.2
   hooks:
   - id: black
     args: [--line-length, '130', --target-version, py38]
@@ -31,7 +31,7 @@ repos:
     args: [--max-line-length, '130']
 
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.12.0
+  rev: v2.13.0
   hooks:
   - id: pretty-format-toml
     args: [--autofix]
@@ -42,13 +42,13 @@ repos:
     args: [--autofix]
 
 - repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.39.0
+  rev: v0.40.0
   hooks:
   - id: markdownlint
     args: [--fix]
 
 - repo: https://github.com/python-poetry/poetry
-  rev: 1.8.0
+  rev: 1.8.2
   hooks:
   - id: poetry-check
   - id: poetry-lock
@@ -57,7 +57,7 @@ repos:
     args: [-f, requirements.txt, -o, requirements.txt, --without-hashes]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.8.0
+  rev: v1.10.0
   hooks:
   - id: mypy
     additional_dependencies: [types-requests]

README.md

@@ -222,7 +222,7 @@ Alternatively, install all required development environment dependencies, includ
 make install
 ```
 
-For developement and testing it is sometimes usefull to trigger TGTG Magic Bag events.
+For developement and testing it is sometimes useful to trigger TGTG Magic Bag events.
 For this purpose you can run the TGTG dev API proxy server.
 The proxy redirects all requests to the official TGTG API server.
 The responses from the item endpoint are modified by randomizing the amount of available magic bags.
@@ -245,7 +245,7 @@ make server
 
 Feel free to create and contribute new notifiers for other services and endpoints.
 You can use an existing notifier as a template or build upon the webhook notifier.
-E.g. see the [ifttt notifier](https://github.com/Der-Henning/tgtg/blob/main/src/notifiers/ifttt.py).
+E.g. see the [ifttt notifier](https://github.com/Der-Henning/tgtg/blob/main/tgtg_scanner/notifiers/ifttt.py).
 
 ---
 If you want to support me, feel free to buy me a coffee.

config.sample.ini

@@ -185,3 +185,12 @@ URL =
 Enabled = false
 Command =
 ; Cron =
+
+[DISCORD]
+## Register an application and associated bot user for use with TGTG scanner at https://discord.com/developers/applications
+## See wiki for more information
+Enabled = false
+Prefix = !
+Token =
+Body =
+; Cron =

docker/Dockerfile

@@ -5,7 +5,10 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_NO_CACHE_DIR=off \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     PIP_NO_WARN_SCRIPT_LOCATION=0 \
-    PIP_ROOT_USER_ACTION=ignore
+    PIP_ROOT_USER_ACTION=ignore \
+    AIOHTTP_NO_EXTENSIONS=1 \
+    MULTIDICT_NO_EXTENSIONS=1 \
+    YARL_NO_EXTENSIONS=1
 ENV TGTG_TOKEN_PATH=/tokens
 ENV LOGS_PATH=/logs
 ENV DOCKER=true

docker/Dockerfile.alpine

@@ -5,7 +5,10 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_NO_CACHE_DIR=off \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     PIP_NO_WARN_SCRIPT_LOCATION=0 \
-    PIP_ROOT_USER_ACTION=ignore
+    PIP_ROOT_USER_ACTION=ignore \
+    AIOHTTP_NO_EXTENSIONS=1 \
+    MULTIDICT_NO_EXTENSIONS=1 \
+    YARL_NO_EXTENSIONS=1
 ENV TGTG_TOKEN_PATH=/tokens
 ENV LOGS_PATH=/logs
 ENV DOCKER=true