From cfa3f2fedb392856bdd608182d6cef40d6928b37 Mon Sep 17 00:00:00 2001
From: Jason Madden <jamadden@gmail.com>
Date: Mon, 11 Dec 2023 12:50:15 -0600
Subject: [PATCH] Windows/appveyor: MySQL 5.7 seems to be gone, try 8.0

---
 CHANGES.rst  |  3 ++-
 appveyor.yml | 16 ++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index fb6b78c2..2b5fce5b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,10 +5,11 @@
 4.0.0 (unreleased)
 ==================
 
+- Packaging: Support for Python 3.12 uses released dependencies.
 - Packaging: Fix a build error with gcc 13.
-- Support for Python 3.12 uses released dependencies.
 - Packaging: x86_64 manylinux wheels are built using a newer
   supported manylinux Docker image.
+- Packaging: Testing on Windows has moved from MySQL 5.7 to MySQL 8.
 
 
 4.0.0a1 (2023-06-30)
diff --git a/appveyor.yml b/appveyor.yml
index 3311513b..2a6e6d69 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,12 +4,7 @@ shallow_clone: true
 build:
   parallel: true
   verbosity: minimal
-# The VS 2019 image doesn't have
-# the MSVC needed for Python 2.7.
-# Note that this contains nothing newer than Python 3.8; there is no
-# image that has all of our supported versions, so we have to
-# customize per version.
-image: Visual Studio 2015
+image: Visual Studio 2022
 
 environment:
   global:
@@ -46,31 +41,26 @@ environment:
       PYTHON_VERSION: "3.12.0b4"
       PYTHON_ARCH: "64"
       PYTHON_EXE: python
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
 
     - PYTHON: "C:\\Python311-x64"
       PYTHON_VERSION: "3.11.0"
       PYTHON_ARCH: "64"
       PYTHON_EXE: python
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
 
     - PYTHON: "C:\\Python310-x64"
       PYTHON_VERSION: "3.10.0"
       PYTHON_ARCH: "64"
       PYTHON_EXE: python
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
 
     - PYTHON: "C:\\Python39-x64"
       PYTHON_VERSION: "3.9.x"
       PYTHON_ARCH: "64"
       PYTHON_EXE: python
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
     - PYTHON: "C:\\Python38-x64"
       PYTHON_VERSION: "3.8.x"
       PYTHON_ARCH: "64"
       PYTHON_EXE: python
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
     ## 32-bit, wheel only (no testing)
 
@@ -88,6 +78,8 @@ services:
 install:
   - ECHO "Filesystem root:"
   - ps: "ls \"C:/\""
+  - ps: "ls \"C:/Program Files/\""
+  - ps: "ls \"C:/Program Files (x86)/\""
 
   - ECHO "Installed SDKs:"
   - ps: "if(Test-Path(\"C:/Program Files/Microsoft SDKs/Windows\")) {ls \"C:/Program Files/Microsoft SDKs/Windows\";}"
@@ -110,7 +102,7 @@ install:
         & scripts\install.ps1;
       }
 
-  - "SET PATH=C:\\Program Files\\PostgreSQL\\10\\bin;C:\\Program Files\\MySql\\MySQL Server 5.7\\bin;%PATH%"
+  - "SET PATH=C:\\Program Files\\PostgreSQL\\10\\bin;C:\\Program Files\\MySql\\MySQL Server 8.0\\bin;%PATH%"
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\bin;%PATH%"
   - "SET PYEXE=%PYTHON%\\%PYTHON_EXE%.exe"