From 1e71438e57196ed4c54e4a8a7c2fa118af4cdc94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Freitag?= <mail@franek.fr>
Date: Fri, 19 Jul 2024 16:38:11 +0200
Subject: [PATCH 1/2] Rename ruff environment in envlist

---
 .github/workflows/test.yml | 14 +++-----------
 tox.ini                    | 13 ++++++++++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d77281d..6cca952 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,20 +13,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
+          - '3.8'
+          - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
           - '3.13-dev'
-        tox-environment:
-          - dj50
-          - dj51
-          - djmain
-        include:
-          - python-version: '3.8'
-            tox-environment: dj42
-          - python-version: '3.9'
-            tox-environment: dj42
-
     env:
       COVERALLS_FLAG_NAME: Python ${{ matrix.python-version }} / ${{ matrix.tox-environment }}
       COVERALLS_PARALLEL: true
@@ -48,7 +40,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
-        run: python -m pip install coveralls tox
+        run: python -m pip install coveralls tox-gh
 
       - name: Run tests
         run: tox
diff --git a/tox.ini b/tox.ini
index 10f21f1..1084f5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,6 @@
 [tox]
 envlist =
-    black
-    flake8
-    isort
+    ruff
     dj42
     dj50
     dj51
@@ -11,6 +9,15 @@ envlist =
 isolated_build = true
 minversion = 1.9
 
+[gh]
+python =
+    3.8 = py38
+    3.9 = py39
+    3.10 = py310
+    3.11 = py311
+    3.12 = py312
+    3.13 = py313
+
 [testenv]
 deps =
     babel

From dd52e96617c26bf57b44a42dddccd3c23a68e6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Freitag?= <mail@franek.fr>
Date: Fri, 19 Jul 2024 16:44:57 +0200
Subject: [PATCH 2/2] Use tox-gh instead of a large test matrix

---
 tox.ini | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1084f5e..95759c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,12 +11,12 @@ minversion = 1.9
 
 [gh]
 python =
-    3.8 = py38
-    3.9 = py39
-    3.10 = py310
-    3.11 = py311
-    3.12 = py312
-    3.13 = py313
+    3.8 = dj42
+    3.9 = dj42
+    3.10 = dj{42,50,51,main}
+    3.11 = dj{42,50,51,main}
+    3.12 = dj{42,50,51,main}
+    3.13 = dj{42,50,51,main}
 
 [testenv]
 deps =