From 380c9c2a47117cf2b36cb15de7f74381dbf6eeb9 Mon Sep 17 00:00:00 2001
From: Frankie Dintino <fdintino@gmail.com>
Date: Thu, 11 Jul 2024 10:20:56 -0400
Subject: [PATCH] chore: update tox envlist and gha matrix

---
 .github/workflows/test.yml | 21 ++++++++++++++++++++-
 tox.ini                    | 32 ++++++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1b94aee..1b274b4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,26 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        grappelli: ["0", "1"]
+        python-version: ["3.11"]
+        django-version: ["4.2"]
+        exclude:
+          - python-version: "3.11"
+            grappelli: "1"
+        include:
+          - python-version: "3.9"
+            django-version: "4.2"
+            grappelli: "0"
+          - python-version: "3.10"
+            django-version: "5.0"
+            grappelli: "0"
+          - python-version: "3.12"
+            django-version: "5.0"
+            grappelli: "1"
+
+    env:
+      DJANGO: ${{ matrix.django-version }}
+      GRAPPELLI: ${{ matrix.grappelli }}
 
     steps:
     - uses: actions/checkout@v3
diff --git a/tox.ini b/tox.ini
index cc3ac8f..b6cc9e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,10 @@
 [tox]
 envlist =
-    py{37,38,39}-dj{22,31,32}{,-grp}
+    py{36,37,38,39}-dj22-{grp,nogrp}
+    py{36,37,38,39,310}-dj32-{grp,nogrp}
+    py{38,39,310,311,312}-dj42-{grp,nogrp}
+    py{310,311,312}-dj50-{grp,nogrp}
+    py{310,311,312}-dj51-nogrp
 
 [testenv]
 commands =
@@ -11,12 +15,14 @@ deps =
     pytest-django
     selenium
     dj22: Django>=2.2,<3.0
-    dj31: Django>=3.1,<3.2
     dj32: Django>=3.2,<4.0
-    dj22-grp: django-grappelli==2.13.4
-    dj31-grp: django-grappelli==2.14.4
-    dj32-grp: django-grappelli==2.15.1
-
+    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
+    dj42-grp: django-grappelli>=3.0,<3.1
+    dj50-grp: django-grappelli>=4.0,<4.1
 
 [testenv:clean]
 description = Clean all build and test artifacts
@@ -38,3 +44,17 @@ python =
     3.7: py37
     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.2: dj42
+    5.0: dj50
+    5.1: dj51
+GRAPPELLI =
+    0: nogrp
+    1: grp