diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 8a4d115a..6e681f54 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -113,9 +113,9 @@ jobs: - name: Download winsparkle run: | - Invoke-Webrequest -UseBasicParsing https://github.com/vslavik/winsparkle/releases/download/v0.8.1/WinSparkle-0.8.1.zip -OutFile out.zip + Invoke-Webrequest -UseBasicParsing https://github.com/vslavik/winsparkle/releases/download/v0.8.3/WinSparkle-0.8.3.zip -OutFile out.zip Expand-Archive out.zip - Move-Item 'out\WinSparkle-0.8.1\Release\*' '.\' + Move-Item 'out\WinSparkle-0.8.3\Release\*' '.\' - name: Build EDMC run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f73fcf73..27544fce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,20 +20,10 @@ repos: # hooks: # - id: autopep8 -### # flake8 --show-source -### - repo: https://github.com/PyCQA/flake8 -### rev: '' -### hooks: -### - id: flake8 -# -# Try using local flake8 -- repo: local - hooks: - - id: flake8 - name: flake8 - entry: flake8 - language: system - types: [ python ] +- repo: https://github.com/PyCQA/flake8 + rev: 7.1.2 + hooks: + - id: flake8 - repo: https://github.com/pre-commit/pygrep-hooks rev: 'v1.10.0' @@ -51,7 +41,7 @@ repos: - id: mypy # verbose: true # log_file: 'pre-commit_mypy.log' - additional_dependencies: [ types-setuptools, types-requests, types-urllib3 ] + additional_dependencies: [ types-setuptools, types-requests ] # args: [ "--follow-imports", "skip", "--ignore-missing-imports", "--scripts-are-modules" ] ### # pydocstyle.exe diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 2e3f7934..80a958e1 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -2196,11 +2196,7 @@ sys.path: {sys.path}''' # Plain, not via `logger` print(f'{applongname} {appversion()}') - fools_lang = config.get_str('language') # Happy April 1st, 2025! - if not config.get('2025_apr1_fooled'): - fools_lang = "uwu" - config.set('2025_apr1_fooled', True) - tr.install(fools_lang) # Can generate errors so wait til log set up + tr.install(config.get_str('language')) # Can generate errors so wait til log set up setup_killswitches(args.killswitches_file) diff --git a/plug.py b/plug.py index ee53e76b..beb53108 100644 --- a/plug.py +++ b/plug.py @@ -8,7 +8,7 @@ See LICENSE file. from __future__ import annotations import copy -import importlib +import importlib.util import logging import operator import os