diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 9a30947a..80b61487 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.4.0 - uses: actions/setup-python@v2.3.1 with: - python-version: "3.9.9" + python-version: "3.10.1" architecture: "x86" - name: Install python tools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a8bfb90c..a6effa3b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: always_run: true default_language_version: - python: python3.9 + python: python3.10 default_stages: [ commit, push ] diff --git a/.python-version b/.python-version index b04bfd83..f870be23 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.9 +3.10.1 diff --git a/ChangeLog.md b/ChangeLog.md index 9bdc3ad7..5c2f7e73 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.9.9. +* We now test against, and package with, Python 3.10.1. **As a consequence of this we no longer support Windows 7. This is due to @@ -25,6 +25,39 @@ produce the Windows executables and installer. in the source (it's not distributed with the Windows installer) for the currently used version in a given branch. +--- +Pre-Release 5.3.0-beta1 +=== + +This is a test release to ensure packaging with Python 3.10.1 is working +correctly. There is also a small change to metadata in any remote web +request we make. + +* We now set a custom User-Agent header in all web requests, i.e. to EDDN, + EDSM and the like. This is of the form: + + `EDCD-EDMarketConnector-` + +Developers +--- + +We now test against, and package with Python 3.10.1. + +We've made no explicit changes to the Python stdlib, or other modules, we +currently offer. However, the newer [py2exe](https://github.com/py2exe/py2exe/) +we now use has decided we no longer need: + + - _aynscio.pyd + - _multiprocessing.pyd + - _overlapped.pyd + +so those are no longer included in the Windows installers. We are looking into +[including all of Python stdlib](https://github.com/EDCD/EDMarketConnector/issues/1327) +so this would be resolved by that. + +If your plugin utilises any module/package that requires per-architecture +libraries then you should check it has Python 3.10 wheels available. + --- Release 5.2.3 diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs index c24a594f..621aafa2 100644 --- a/EDMarketConnector.wxs +++ b/EDMarketConnector.wxs @@ -113,9 +113,6 @@ - - - @@ -134,12 +131,6 @@ - - - - - - @@ -152,12 +143,15 @@ - - - + + + + + + @@ -198,7 +192,13 @@ - + + + + + + + @@ -227,6 +227,15 @@ + + + + + + + + + @@ -562,21 +571,19 @@ - - - - + + @@ -604,7 +611,9 @@ - + + + @@ -620,6 +629,9 @@ + + + diff --git a/config.py b/config.py index 882bd4c5..7df3e218 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta0' +_static_appversion = '5.3.0-beta1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' diff --git a/requirements-dev.txt b/requirements-dev.txt index 3b443e17..afc11caf 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -28,7 +28,7 @@ grip==4.5.2 # Packaging # We only need py2exe on windows. -py2exe==0.10.4.1; sys_platform == 'win32' +py2exe==0.11.0.1; sys_platform == 'win32' # Testing pytest==6.2.5 diff --git a/setup.py b/setup.py index 183a7383..52be2c78 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ from config import ( ) from constants import GITVERSION_FILE -if sys.version_info[0:2] != (3, 9): +if sys.version_info[0:2] != (3, 10): raise AssertionError(f'Unexpected python version {sys.version}') ###########################################################################