From 3a28945ad5696f5e0f50ffeee6ece017cb77a050 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 3 Dec 2021 11:17:18 +0000
Subject: [PATCH 1/8] Python 3.10: Change version number in most of our local
 files

The requirements-dev.txt change for py2exe will be in a separate commit.
---
 .github/workflows/windows-build.yml | 2 +-
 .pre-commit-config.yaml             | 2 +-
 .python-version                     | 2 +-
 EDMarketConnector.wxs               | 2 +-
 setup.py                            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 9a30947a..74f8ebe8 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.0"
           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..30291cba 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.9.9
+3.10.0
diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index c24a594f..afa69e1a 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -198,7 +198,7 @@
 						<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\rare_commodity.csv" />
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}')
 
 ###########################################################################

From d546e84031e39f68cc7e60821d5b158c42ef93a5 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 3 Dec 2021 11:40:31 +0000
Subject: [PATCH 2/8] Python 3.10: Bump py2exe version

---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 74c2c295bcabfac02bf97bf718cf486b4edc6994 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 3 Dec 2021 11:47:14 +0000
Subject: [PATCH 3/8] Python 3.10: Remove un-necessary pyd files

_aynscio.pyd
_multiprocessing.pyd
_overlapped.pyd

They do still exist in Python 3.10, but we don't use them and it seems
py2exe is no longer causing their inclusion in the build.
---
 EDMarketConnector.wxs | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index afa69e1a..d56dff92 100644
--- a/EDMarketConnector.wxs
+++ b/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,9 +143,6 @@
 					<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>
@@ -562,20 +550,16 @@
 			<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="cacert.pem" />
 			<ComponentRef Id="ChangeLog.md" />
@@ -604,7 +588,7 @@
 			<ComponentRef Id="pt_BR.strings" />
 			<ComponentRef Id="pt_PT.strings" />
 			<ComponentRef Id="pyexpat.pyd" />
-			<ComponentRef Id="python39.dll" />
+			<ComponentRef Id="python310.dll" />
 			<ComponentRef Id="rare_commodity.csv" />
 			<ComponentRef Id="ru.strings" />
 			<ComponentRef Id="select.pyd" />

From bb65718cef0703c8f1c3723a4314d7f71ae59063 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 3 Dec 2021 12:21:36 +0000
Subject: [PATCH 4/8] Python 3.10: Final adjustments to .wxs file

We were missing some new files which seemed to be the cause of issues
with the definitely included and installed _tkinter.pyd.  I think it was
due to missing _win32sysloader.pyd but didn't test in detail.
---
 EDMarketConnector.wxs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index d56dff92..621aafa2 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -146,6 +146,12 @@
 					<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>
@@ -188,6 +194,12 @@
 					<Component Guid="*">
 						<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" />
 					</Component>
@@ -215,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>
@@ -561,6 +582,8 @@
 			<ComponentRef Id="_sqlite3.pyd" />
 			<ComponentRef Id="_ssl.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" />
@@ -589,6 +612,8 @@
 			<ComponentRef Id="pt_PT.strings" />
 			<ComponentRef Id="pyexpat.pyd" />
 			<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" />
@@ -604,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" />

From 8be6a53f43468198ff36e26cfdeb9625098ca782 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Sat, 4 Dec 2021 09:26:23 +0000
Subject: [PATCH 5/8] Python 3.10: Change tcl/tk DLLs to '*' GUID

For reasons not logged by:

	msiexec /l*vx 5.3.0-beta0-install.txt /i EDMarketConnector_win_5.3.0-beta0.msi

if you install the GitHub-built 5.3.0-beta0 installer in place of 5.2.3
the two files tcl86t.dll & tk86t.dll do not get installed.  Other than
WinSparkle.dll (which won't have changed in a long time) they're the
only two DLL files with a hard-coded GUID.  So let's try changing them
to '*'.
---
 EDMarketConnector.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 621aafa2..d5d145bc 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -218,10 +218,10 @@
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\sqlite3.dll" />
 					</Component>
-					<Component Guid="{30EEAD30-A43B-4A31-A209-450A8AD17AC2}">
+					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\tcl86t.dll" />
 					</Component>
-					<Component Guid="{CE5A6F3A-8F6B-4C16-BCDC-F1BB89C9F1AF}">
+					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\tk86t.dll" />
 					</Component>
 					<Component Guid="{E8E3701A-8AA1-4D46-A56D-7AF08D6AFCD4}">

From 5b20451209f5df21acec14772761f6eeb8fdfe89 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Sun, 5 Dec 2021 11:34:12 +0000
Subject: [PATCH 6/8] Revert "Python 3.10: Change tcl/tk DLLs to '*' GUID"

This reverts commit 8be6a53f43468198ff36e26cfdeb9625098ca782.

It didn't help and will potentially cause other issues.
---
 EDMarketConnector.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index d5d145bc..621aafa2 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -218,10 +218,10 @@
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\sqlite3.dll" />
 					</Component>
-					<Component Guid="*">
+					<Component Guid="{30EEAD30-A43B-4A31-A209-450A8AD17AC2}">
 						<File KeyPath="yes" Source="SourceDir\tcl86t.dll" />
 					</Component>
-					<Component Guid="*">
+					<Component Guid="{CE5A6F3A-8F6B-4C16-BCDC-F1BB89C9F1AF}">
 						<File KeyPath="yes" Source="SourceDir\tk86t.dll" />
 					</Component>
 					<Component Guid="{E8E3701A-8AA1-4D46-A56D-7AF08D6AFCD4}">

From 342edf57d4a4bf4d2886c6c3a58447aeb40e1196 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Tue, 7 Dec 2021 11:03:00 +0000
Subject: [PATCH 7/8] Python: Bump 3.10.1

---
 .github/workflows/windows-build.yml | 2 +-
 .python-version                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 74f8ebe8..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.10.0"
+          python-version: "3.10.1"
           architecture: "x86"
 
       - name: Install python tools
diff --git a/.python-version b/.python-version
index 30291cba..f870be23 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.10.0
+3.10.1

From f3b5f2b4ede9d6c570540df93b938b78194f442f Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Tue, 7 Dec 2021 11:28:11 +0000
Subject: [PATCH 8/8] Pre-Release 5.3.0-beta1: appversion & changelog

---
 ChangeLog.md | 35 ++++++++++++++++++++++++++++++++++-
 config.py    |  2 +-
 2 files changed, 35 insertions(+), 2 deletions(-)

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-<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
diff --git a/config.py b/config.py
index 882bd4c5..7df3e218 100644
--- a/config.py
+++ b/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'