From a13f7149a6ba6d88aa0ef99191591aacc73d9e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Paduszy=C5=84ski?= <paduszyk@gmail.com>
Date: Tue, 16 Jun 2026 14:30:44 +0200
Subject: [PATCH 1/4] Fix envlist order in tox.ini for pytest environments

Just to make it consistent with CI.
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index ad59222c..76e424c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
 minversion = 4.0
 isolated_build = true
 envlist =
-  py{310,311,312,313,314,py3}-pytest8
-  py39-pytest{5,6,7,8}
+  py{39,310,311,312,313,314,py3}-pytest8
+  py39-pytest{5,6,7}
   flake8
 
 

From 92c961b45dfdaca2dd92baf89a7e8ced37dd4637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Paduszy=C5=84ski?= <paduszyk@gmail.com>
Date: Tue, 16 Jun 2026 14:33:36 +0200
Subject: [PATCH 2/4] Add pytest 9 to envlist and dependencies in tox.ini

All tests pass.
---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 76e424c1..ba930189 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 minversion = 4.0
 isolated_build = true
 envlist =
+  py{310,311,312,313,314,py3}-pytest9
   py{39,310,311,312,313,314,py3}-pytest8
   py39-pytest{5,6,7}
   flake8
@@ -16,6 +17,7 @@ deps =
     pytest6: pytest~=6.2
     pytest7: pytest>=7
     pytest8: pytest>=8
+    pytest9: pytest>=9
 
 
 [testenv:flake8]

From 2d7e5226c08ac4dceef1f1434d163d8a0b209001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Paduszy=C5=84ski?= <paduszyk@gmail.com>
Date: Tue, 16 Jun 2026 15:07:17 +0200
Subject: [PATCH 3/4] Update CI test matrices to use pytest 9 for Python
 environments

NOTE: pytest 8 is now tested within test-legacy-pytest job's matrix.
---
 .github/workflows/test.yml | 47 ++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fc16527d..c14603f2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,27 +29,24 @@ jobs:
     needs: [package]
 
     runs-on: ${{ matrix.os }}
-
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.10"]
         os: [ubuntu-latest, windows-latest]
+        pytest: ["9"]
         include:
-          - python: "3.9"
-            tox_env: "py39-pytest8"
           - python: "3.10"
-            tox_env: "py310-pytest8"
+            tox_env: "py310-pytest9"
           - python: "3.11"
-            tox_env: "py311-pytest8"
+            tox_env: "py311-pytest9"
           - python: "3.12"
-            tox_env: "py312-pytest8"
+            tox_env: "py312-pytest9"
           - python: "3.13"
-            tox_env: "py313-pytest8"
+            tox_env: "py313-pytest9"
           - python: "3.14"
-            tox_env: "py314-pytest8"
+            tox_env: "py314-pytest9"
           - python: "pypy3.10"
-            tox_env: "pypy3-pytest8"
+            tox_env: "pypy3-pytest9"
 
     steps:
     - uses: actions/checkout@v4
@@ -78,21 +75,43 @@ jobs:
 
   test-legacy-pytest:
 
-    needs: [package]
-
+    needs: [package]    
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        pytest: ["5", "6", "7"]
         include:
           - pytest: "5"
+            python: "3.9"
             tox_env: "py39-pytest5"
           - pytest: "6"
+            python: "3.9"
             tox_env: "py39-pytest6"
           - pytest: "7"
+            python: "3.9"
             tox_env: "py39-pytest7"
+          - pytest: "8"
+            python: "3.9"
+            tox_env: "py39-pytest8"
+          - pytest: "8"
+            python: "3.10"
+            tox_env: "py310-pytest8"
+          - pytest: "8"
+            python: "3.11"
+            tox_env: "py311-pytest8"
+          - pytest: "8"
+            python: "3.12"
+            tox_env: "py312-pytest8"
+          - pytest: "8"
+            python: "3.13"
+            tox_env: "py313-pytest8"
+          - pytest: "8"
+            python: "3.14"
+            tox_env: "py314-pytest8"
+          - pytest: "8"
+            python: "pypy3.10"
+            tox_env: "pypy3-pytest8"
 
     steps:
       - uses: actions/checkout@v4
@@ -106,7 +125,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.9"
+          python-version: ${{ matrix.python }}
 
       - name: Install tox
         run: |

From 0c5b5acc76d1752e36fb44ab84649612a5fd5fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Paduszy=C5=84ski?= <paduszyk@gmail.com>
Date: Tue, 16 Jun 2026 15:16:25 +0200
Subject: [PATCH 4/4] Add descriptive names for test jobs in GitHub Actions
 workflow

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c14603f2..bb69a307 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,6 +25,7 @@ jobs:
         uses: hynek/build-and-inspect-python-package@v2
 
   test:
+    name: tests (Python ${{ matrix.python }}, pytest ${{ matrix.pytest }})
 
     needs: [package]
 
@@ -74,6 +75,7 @@ jobs:
 
 
   test-legacy-pytest:
+    name: legacy-tests (Python ${{ matrix.python }}, pytest ${{ matrix.pytest }})
 
     needs: [package]    
     runs-on: ubuntu-latest