From 67c2e04f706f9f7f8efa6bd6437632ab8e546cae Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 30 Oct 2024 08:37:19 +0200
Subject: [PATCH 1/4] Add trove-classifiers>=2024.10.12 to 'tests' extra and
 use for Windows CI

---
 .github/workflows/test-windows.yml | 13 +------------
 pyproject.toml                     |  1 +
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index f6d0aeb1d4a..4ac6f8769a5 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -69,17 +69,6 @@ jobs:
     - name: Print build system information
       run: python3 .github/workflows/system-info.py
 
-    - name: Install Python dependencies
-      run: >
-        python3 -m pip install
-        coverage>=7.4.2
-        defusedxml
-        olefile
-        pyroma
-        pytest
-        pytest-cov
-        pytest-timeout
-
     - name: Install CPython dependencies
       if: "!contains(matrix.python-version, 'pypy')"
       run: >
@@ -184,7 +173,7 @@ jobs:
     - name: Build Pillow
       run: |
         $FLAGS="-C raqm=vendor -C fribidi=vendor"
-        cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS ."
+        cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS .[tests]"
         & $env:pythonLocation\python.exe selftest.py --installed
       shell: pwsh
 
diff --git a/pyproject.toml b/pyproject.toml
index c55be769341..45d5c269261 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -65,6 +65,7 @@ optional-dependencies.tests = [
   "pytest",
   "pytest-cov",
   "pytest-timeout",
+  "trove-classifiers>=2024.10.12",
 ]
 optional-dependencies.typing = [
   "typing-extensions; python_version<'3.10'",

From 0bf15f0f2a856907bf925fc797a107a33069b734 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:24:37 +0200
Subject: [PATCH 2/4] Upgrade pip

---
 .github/workflows/test-windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 4ac6f8769a5..728182b1ec1 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -71,9 +71,9 @@ jobs:
 
     - name: Install CPython dependencies
       if: "!contains(matrix.python-version, 'pypy')"
-      run: >
-        python3 -m pip install
-        PyQt6
+      run: |
+        python3 -m pip install --upgrade pip
+        python3 -m pip install PyQt6
 
     - name: Install dependencies
       id: install

From 5628213ab03b59e2a70087c65cf4f05aa8de8cdf Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Mon, 4 Nov 2024 21:17:47 +0200
Subject: [PATCH 3/4] Upgrade pip for all

---
 .github/workflows/test-windows.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 728182b1ec1..9fcb8cb94c1 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -69,10 +69,13 @@ jobs:
     - name: Print build system information
       run: python3 .github/workflows/system-info.py
 
+    - name: Upgrade pip
+      run: |
+        python3 -m pip install --upgrade pip
+
     - name: Install CPython dependencies
       if: "!contains(matrix.python-version, 'pypy')"
       run: |
-        python3 -m pip install --upgrade pip
         python3 -m pip install PyQt6
 
     - name: Install dependencies

From 042f3ff083d98d211c2035dd45e511a63800d06e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 7 Nov 2024 07:52:18 +1100
Subject: [PATCH 4/4] Require coverage>=7.4.2

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 45d5c269261..bff295bc60f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,7 @@ optional-dependencies.mic = [
 ]
 optional-dependencies.tests = [
   "check-manifest",
-  "coverage",
+  "coverage>=7.4.2",
   "defusedxml",
   "markdown2",
   "olefile",