From 8df2fa3660b34fabbd0ba2a12cce779b6da68aa9 Mon Sep 17 00:00:00 2001
From: Matthias Kestenholz <mk@feinheit.ch>
Date: Tue, 28 Sep 2021 09:10:24 +0200
Subject: [PATCH 1/2] Add Django 4.0a1 to tox.ini

---
 tox.ini | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index e65718d29..c8a62cc48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,17 @@ envlist =
     style
     packaging
     py{36,37}-dj{22,31,32}-sqlite
-    py{38,39}-dj{22,31,32,main}-sqlite
+    py{38,39}-dj{22,31,32,40,main}-sqlite
     py{36,37,38,39}-dj{22,31,32}-{postgresql,mysql}
-    py{310}-dj{32,main}-{sqlite,postgresql,mysql}
+    py{38,39}-dj{40,main}-{postgresql,mysql}
+    py{310}-dj{32,40,main}-{sqlite,postgresql,mysql}
 
 [testenv]
 deps =
     dj22: Django==2.2.*
     dj31: Django==3.1.*
-    dj32: Django>=3.2a1,<4.0
+    dj32: Django>=3.2,<4.0
+    dj40: Django>=4.0a1,<4.1
     sqlite: mock
     postgresql: psycopg2-binary
     mysql: mysqlclient

From 696ebb8539ef59b4267bc6872634bf4ea736ccc7 Mon Sep 17 00:00:00 2001
From: Matthias Kestenholz <mk@feinheit.ch>
Date: Tue, 28 Sep 2021 09:43:03 +0200
Subject: [PATCH 2/2] Rewrite the tox.ini matrix

Thanks @felixmm!
---
 tox.ini | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index c8a62cc48..f1cb89a0b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,11 +3,9 @@ envlist =
     docs
     style
     packaging
-    py{36,37}-dj{22,31,32}-sqlite
-    py{38,39}-dj{22,31,32,40,main}-sqlite
-    py{36,37,38,39}-dj{22,31,32}-{postgresql,mysql}
-    py{38,39}-dj{40,main}-{postgresql,mysql}
-    py{310}-dj{32,40,main}-{sqlite,postgresql,mysql}
+    py{36,37}-dj{22,31,32}-{sqlite,postgresql,mysql}
+    py{38,39}-dj{22,31,32,40,main}-{sqlite,postgresql,mysql}
+    py{310}-dj{40,main}-{sqlite,postgresql,mysql}
 
 [testenv]
 deps =