Merge pull request #1366 from EDCD/enhancement/1349/python-3.10

Upgrade to using Python 3.10

.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

.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 ]
 

.python-version

@@ -1 +1 @@
-3.9.9
+3.10.1

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-<version>`
+
+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

EDMarketConnector.wxs

@@ -113,9 +113,6 @@
 						<File Id="EDMarketConnector.exe" KeyPath="yes" Source="SourceDir\EDMarketConnector.exe" />
 						<Shortcut Id="MainExeShortcut" Directory="ProgramMenuFolder" Name="$(var.PRODUCTLONGNAME)" Description="Downloads station data from Elite: Dangerous" WorkingDirectory="INSTALLDIR" Icon="EDMarketConnector.exe" IconIndex="0" Advertise="yes" />
 					</Component>
-					<Component Guid="*">
-						<File KeyPath="yes" Source="SourceDir\_asyncio.pyd" />
-					</Component>
 					<Component Guid="{842DC919-EC3D-48EF-A6B3-9A81608E0FB9}">
 						<File KeyPath="yes" Source="SourceDir\_bz2.pyd" />
 					</Component>
@@ -134,12 +131,6 @@
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\_lzma.pyd" />
 					</Component>
-					<Component Guid="*">
-						<File KeyPath="yes" Source="SourceDir\_multiprocessing.pyd" />
-					</Component>
-					<Component Guid="*">
-						<File KeyPath="yes" Source="SourceDir\_overlapped.pyd" />
-					</Component>
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\_queue.pyd" />
 					</Component>
@@ -152,12 +143,15 @@
 					<Component Guid="{2EA8F0B6-A104-4D31-99F0-3535ACDC26A9}">
 						<File KeyPath="yes" Source="SourceDir\_ssl.pyd" />
 					</Component>
-					<Component Guid="*">
-						<File KeyPath="yes" Source="SourceDir\_testcapi.pyd" />
-					</Component>
 					<Component Guid="{D2F0CDD2-E934-419F-BC99-445E8FD3AF24}">
 						<File KeyPath="yes" Source="SourceDir\_tkinter.pyd" />
 					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\_uuid.pyd" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\_win32sysloader.pyd" />
+					</Component>
 					<Component Guid="{62DF41B7-0BE8-48F3-BB22-90E9201A6D8C}">
 						<File KeyPath="yes" Source="SourceDir\cacert.pem" />
 					</Component>
@@ -198,7 +192,13 @@
 						<File KeyPath="yes" Source="SourceDir\pyexpat.pyd" />
 					</Component>
 					<Component Guid="*">
-						<File KeyPath="yes" Source="SourceDir\python39.dll" />
+						<File KeyPath="yes" Source="SourceDir\python310.dll" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\pythoncom310.dll" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\pywintypes310.dll" />
 					</Component>
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\rare_commodity.csv" />
@@ -227,6 +227,15 @@
 					<Component Guid="{E8E3701A-8AA1-4D46-A56D-7AF08D6AFCD4}">
 						<File KeyPath="yes" Source="SourceDir\unicodedata.pyd" />
 					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\win32api.pyd" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\win32com.shell.shell.pyd" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\win32evtlog.pyd" />
+					</Component>
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\winsound.pyd" />
 					</Component>
@@ -562,21 +571,19 @@
 			<ComponentRef Id="RegistryEntries" />
 			<ComponentRef Id="MainExecutable" />
 			<ComponentRef Id="gitversion" />
-			<ComponentRef Id="_asyncio.pyd" />
 			<ComponentRef Id="_bz2.pyd" />
 			<ComponentRef Id="_ctypes.pyd" />
 			<ComponentRef Id="_decimal.pyd" />
 			<ComponentRef Id="_elementtree.pyd" />
 			<ComponentRef Id="_hashlib.pyd" />
 			<ComponentRef Id="_lzma.pyd" />
-			<ComponentRef Id="_multiprocessing.pyd" />
-			<ComponentRef Id="_overlapped.pyd" />
 			<ComponentRef Id="_queue.pyd" />
 			<ComponentRef Id="_socket.pyd" />
 			<ComponentRef Id="_sqlite3.pyd" />
 			<ComponentRef Id="_ssl.pyd" />
-			<ComponentRef Id="_testcapi.pyd" />
 			<ComponentRef Id="_tkinter.pyd" />
+			<ComponentRef Id="_uuid.pyd" />
+			<ComponentRef Id="_win32sysloader.pyd" />
 			<ComponentRef Id="cacert.pem" />
 			<ComponentRef Id="ChangeLog.md" />
 			<ComponentRef Id="commodity.csv" />
@@ -604,7 +611,9 @@
 			<ComponentRef Id="pt_BR.strings" />
 			<ComponentRef Id="pt_PT.strings" />
 			<ComponentRef Id="pyexpat.pyd" />
-			<ComponentRef Id="python39.dll" />
+			<ComponentRef Id="python310.dll" />
+			<ComponentRef Id="pythoncom310.dll" />
+			<ComponentRef Id="pywintypes310.dll" />
 			<ComponentRef Id="rare_commodity.csv" />
 			<ComponentRef Id="ru.strings" />
 			<ComponentRef Id="select.pyd" />
@@ -620,6 +629,9 @@
 			<ComponentRef Id="tk86t.dll" />
 			<ComponentRef Id="uk.strings" />
 			<ComponentRef Id="unicodedata.pyd" />
+			<ComponentRef Id="win32api.pyd" />
+			<ComponentRef Id="win32com.shell.shell.pyd" />
+			<ComponentRef Id="win32evtlog.pyd" />
 			<ComponentRef Id="winsound.pyd" />
 			<ComponentRef Id="WinSparkle.dll" />
 			<ComponentRef Id="EDMarketConnector_TRACE.bat" />

config.py

@@ -33,7 +33,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.3.0-beta0'
+_static_appversion = '5.3.0-beta1'
 _cached_version: Optional[semantic_version.Version] = None
 copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD'
 

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

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}')
 
 ###########################################################################