Merge branch 'main' into develop

.pre-commit-config.yaml

@@ -20,28 +20,18 @@ repos:
         #    hooks:
         #      - id: autopep8
 
-### # flake8 --show-source <file>
-### -   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'
     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 <file>
@@ -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 <file>
@@ -64,7 +54,7 @@ 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
@@ -89,6 +79,6 @@ repos:
 default_language_version:
     python: python3.11
 
-default_stages: [ commit, push ]
+default_stages: [ pre-commit, pre-push ]
 
 #files: '([^\.].+/)*.py'

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.

EDMarketConnector.py

@@ -2205,11 +2205,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)
 

config/__init__.py

@@ -52,7 +52,7 @@ appcmdname = 'EDMC'
 # <https://semver.org/#semantic-versioning-specification-semver>
 # 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'
 

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

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