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 51702e14..27544fce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,38 +20,28 @@ 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.9.0' + rev: 'v1.10.0' hooks: - - id: python-no-eval - - id: python-no-log-warn + - id: python-no-eval + - id: python-no-log-warn # This is a pain where a comment begins with the word 'type' otherwise -# - id: python-use-type-annotations +# - id: python-use-type-annotations # mypy - static type checking # mypy --follow-imports skip - repo: https://github.com/pre-commit/mirrors-mypy - rev: 'v0.991' + rev: 'v1.15.0' hooks: - 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 @@ -64,11 +54,11 @@ repos: # - repo: https://github.com/digitalpulp/pre-commit-php # rev: '' # hooks: -# -id: php-unit +# -id: php-unit # safety.exe check -r requirements.txt - repo: https://github.com/Lucas-C/pre-commit-hooks-safety - rev: 'v1.2.3' + rev: 'v1.4.0' hooks: - id: python-safety-dependencies-check entry: safety @@ -89,6 +79,6 @@ repos: default_language_version: python: python3.11 -default_stages: [ commit, push ] +default_stages: [ pre-commit, pre-push ] #files: '([^\.].+/)*.py' diff --git a/ChangeLog.md b/ChangeLog.md index e443ef2f..3e46a5d8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,6 +7,30 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are currently used version. --- +Release 5.12.5 +=== +Well that was certainly something. Happy April! This release removes the April 1 UwUification of EDMC + as well as updating WinSparkle versions, updated requirements, and fixes a minor bug in the plugin system. + +**Changes and Enhancements** +* Updates WinSparkle Updater +* Updated a number of development pre-commit hooks +* Removes the One-Time-UwU +* Adds UwU as an additional supported language +* Updated a number of dependencies + +**Bug Fixes** +* Fixes a minor bug that could cause importlib in plug.py to not think it was loaded + +**Plugin Developers** +* nb.Entry is deprecated, and is slated for removal in 6.0 or later. Please migrate to nb.EntryMenu +* nb.ColoredButton is deprecated, and is slated for removal in 6.0 or later. Please migrate to tk.Button +* Calling internal translations with `_()` is deprecated, and is slated for removal in 6.0 or later. Please migrate to importing `translations` and calling `translations.translate` or `translations.tl` directly +* `Translations` as the translate system singleton is deprecated, and is slated for removal in 6.0 or later. Please migrate to the `translations` singleton +* `help_open_log_folder()` is deprecated, and is slated for removal in 6.0 or later. Please migrate to open_folder() +* `update_feed` is deprecated, and is slated for removal in 6.0 or later. Please migrate to `get_update_feed()`. + + Release 5.12.4 === This is a wewease update a nyumbew of dependencies, twanswations, and fix a bug with misnyamed ewements. 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/config/__init__.py b/config/__init__.py index 05e629b2..7232ed89 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.12.4' +_static_appversion = '5.12.5' _cached_version: semantic_version.Version | None = None copyright = '© 2015-2019 Jonathan Harris, 2020-2024 EDCD' 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 diff --git a/requirements-dev.txt b/requirements-dev.txt index e00633c5..a36ee506 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,9 +16,9 @@ flake8-use-fstring==1.4 mypy==1.15.0 pep8-naming==0.14.1 -safety==3.2.14 -types-requests==2.32.0.20241016 -types-setuptools==75.8.0.20250210 +safety==3.3.1 +types-requests==2.32.0.20250328 +types-setuptools==78.1.0.20250329 # Code formatting tools autopep8==2.3.2 @@ -34,8 +34,8 @@ mistune==3.1.1 py2exe==0.13.0.2; sys_platform == 'win32' # Testing -pytest==8.3.4 -pytest-cov==6.0.0 # Pytest code coverage support +pytest==8.3.5 +pytest-cov==6.1.0 # Pytest code coverage support coverage[toml]==7.6.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs coverage-conditional-plugin==0.9.0 diff --git a/requirements.txt b/requirements.txt index b4d02a4b..430617c2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ watchdog==6.0.0 simplesystray==0.1.0; sys_platform == 'win32' semantic-version==2.10.0 # For manipulating folder permissions and the like. -pywin32==308; sys_platform == 'win32' +pywin32==310; sys_platform == 'win32' psutil==6.1.1