chore(ci): update tox envlist and gha matrix

theatlantic · Jul 13, 2024 · d26a33e · d26a33e
1 parent e09dad5
commit d26a33e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,27 +7,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        grappelli: ["0"]
-        python-version: ["3.8"]
-        django-version: ["3.2"]
+        grappelli: ["0", "1"]
+        python-version: ["3.11"]
+        django-version: ["4.2"]
+        exclude:
+          - python-version: "3.11"
+            grappelli: "1"
         include:
-          - grappelli: "0"
-            name-suffix: ""
           - python-version: "3.9"
-            django-version: "4.0"
+            django-version: "4.2"
+            grappelli: "1"
+          - python-version: "3.9"
+            django-version: "5.0"
+            grappelli: "0"
           - python-version: "3.10"
-            django-version: "4.1"
-          - grappelli: "1"
-            name-suffix: " + grappelli"
-            python-version: "3.7"
-            django-version: "3.2"
-          - grappelli: "1"
-            name-suffix: " + grappelli"
-            python-version: "3.8"
-            django-version: "4.0"
+            django-version: "5.0"
+            grappelli: "1"
+          - python-version: "3.12"
+            django-version: "5.1"
+            grappelli: "0"
 
     runs-on: ubuntu-latest
-    name: Django ${{ matrix.django-version }} (Python ${{ matrix.python-version }})${{ matrix.name-suffix }}
+    name: Django ${{ matrix.django-version }} (Python ${{ matrix.python-version }})${{ matrix.grappelli == '1' && ' + grappelli' || '' }}
 
     env:
       DJANGO: ${{ matrix.django-version }}

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,10 @@ envlist =
     py{36,37,38,39}-dj22-{grp,nogrp}
     py{36,37,38,39,310}-dj32-{grp,nogrp}
     py{38,39,310}-dj40-{grp,nogrp}
-    py{38,39,310}-dj41-nogrp
+    py{38,39,310,311}-dj41-{grp,nogrp}
+    py{38,39,310,311,312}-dj42-{grp,nogrp}
+    py{310,311,312}-dj50-{grp,nogrp}
+    py{310,311,312}-dj51-nogrp
     black,flake8
 skipsdist=True
 
@@ -32,9 +35,16 @@ deps =
     dj22: Django>=2.2,<3.0
     dj32: Django>=3.2,<4.0
     dj40: Django>=4.0,<4.1
+    dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<4.3
+    dj50: Django>=5.0,<5.1
+    dj51: Django>=5.1a1,<5.2
     dj22-grp: django-grappelli>=2.13,<2.14
     dj32-grp: django-grappelli>=2.15,<2.16
-    dj40-grp: django-grappelli>=3.0,<3.1
+    dj40-grp: django-grappelli==3.0.8
+    dj41-grp: django-grappelli==3.0.8
+    dj42-grp: django-grappelli>=3.0,<3.1
+    dj50-grp: django-grappelli>=4.0,<4.1
 
 [testenv:black]
 basepython = python3.9
@@ -79,13 +89,18 @@ python =
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
+    3.12: py312
 
 [gh-actions:env]
 DJANGO =
     2.2: dj22
     3.2: dj32
     4.0: dj40
     4.1: dj41
+    4.2: dj42
+    5.0: dj50
+    5.1: dj51
 GRAPPELLI =
     0: nogrp
     1: grp