From 5444f4c3e6aee6114744565b6dd81955e195d776 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Mon, 23 Oct 2023 20:52:17 -0400
Subject: [PATCH 1/2] Add CI for Python 3.12 (and drop EOL Python 3.7)

---
 .azure/ci-linux-job.yml   |  4 ++--
 .azure/ci-macos-job.yml   |  4 ++--
 .azure/ci-windows-job.yml | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.azure/ci-linux-job.yml b/.azure/ci-linux-job.yml
index 45a2b2f0..6d6e7134 100644
--- a/.azure/ci-linux-job.yml
+++ b/.azure/ci-linux-job.yml
@@ -6,8 +6,6 @@ jobs:
     vmImage: 'Ubuntu 20.04'
   strategy:
     matrix:
-      Py37:
-        python.version: '3.7'
       Py38:
         python.version: '3.8'
       Py39:
@@ -16,6 +14,8 @@ jobs:
         python.version: '3.10'
       Py311:
         python.version: '3.11'
+      Py312:
+        python.version: '3.12'
 
   variables:
     PYTHONUNBUFFERED: '1'
diff --git a/.azure/ci-macos-job.yml b/.azure/ci-macos-job.yml
index 69a3779d..63558995 100644
--- a/.azure/ci-macos-job.yml
+++ b/.azure/ci-macos-job.yml
@@ -6,8 +6,6 @@ jobs:
     vmImage: 'macOS-11'
   strategy:
     matrix:
-      Py37:
-        python.version: '3.7'
       Py38:
         python.version: '3.8'
       Py39:
@@ -16,6 +14,8 @@ jobs:
         python.version: '3.10'
       Py311:
         python.version: '3.11'
+      Py312:
+        python.version: '3.12'
 
   variables:
     PYTHONUNBUFFERED: '1'
diff --git a/.azure/ci-windows-job.yml b/.azure/ci-windows-job.yml
index 61f21c86..b1379b49 100644
--- a/.azure/ci-windows-job.yml
+++ b/.azure/ci-windows-job.yml
@@ -6,10 +6,6 @@ jobs:
     vmImage: 'windows-2022'
   strategy:
     matrix:
-      Py37_x86:
-        python.version: '3.7'
-        python.arch: x86
-        addToPath: true
       Py38_x86:
         python.version: '3.8'
         python.arch: x86
@@ -26,11 +22,11 @@ jobs:
         python.version: '3.11'
         python.arch: x86
         addToPath: true
-
-      Py37_x64:
-        python.version: '3.7'
-        python.arch: x64
+      Py312_x86:
+        python.version: '3.12'
+        python.arch: x86
         addToPath: true
+
       Py38_x64:
         python.version: '3.8'
         python.arch: x64
@@ -47,6 +43,10 @@ jobs:
         python.version: '3.11'
         python.arch: x64
         addToPath: true
+      Py312_x64:
+        python.version: '3.12'
+        python.arch: x64
+        addToPath: true
 
 
   variables: {'PYTHONUNBUFFERED': '1'}

From e1c07382219f9dc3add89e0f75d0506f648292d0 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Wed, 25 Oct 2023 19:42:06 -0400
Subject: [PATCH 2/2] Windows CI: remove extra MSVC configuration

Due to there being multiple MSVC versions installed on the Azure images,
the build process seems to be getting parts of both of them, so remove
the older one.
---
 .azure/ci-windows-job.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.azure/ci-windows-job.yml b/.azure/ci-windows-job.yml
index b1379b49..0508112c 100644
--- a/.azure/ci-windows-job.yml
+++ b/.azure/ci-windows-job.yml
@@ -74,6 +74,10 @@ jobs:
       python -m pip install --prefer-binary -r requirements.txt
     displayName: 'Install Python dependencies'
 
+  - bash: |
+      rm C:/Program\ Files/Microsoft\ Visual\ Studio/2022/Enterprise/VC/Auxiliary/Build/Microsoft.VCToolsVersion.v143.default.*
+    displayName: 'Remove extra MSVC version'
+
   - task: BatchScript@1
     displayName: 'Set up vcvarsall'
     inputs: