From 5daa0c53294b6b956ceb1b0c7b6204806de788b2 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Thu, 3 Dec 2020 23:22:58 +0100
Subject: [PATCH] Split up test matrix into Python-Django combinations

---
 .github/workflows/test.yml | 22 +++++++++++++++++-----
 tox.ini                    |  7 ++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 96ca50f..2b946a5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,8 @@
 name: Test
 
-on: [push, pull_request]
+on:
+- push
+- pull_request
 
 jobs:
   build:
@@ -8,7 +10,16 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version:
+        - '3.6'
+        - '3.7'
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        django-version:
+        - '2.2'
+        - '3.2'
+        - '4.0'
 
     steps:
     - uses: actions/checkout@v2
@@ -37,9 +48,10 @@ jobs:
         python -m pip install --upgrade pip
         python -m pip install --upgrade tox tox-gh-actions
 
-    - name: Tox tests
-      run: |
-        tox -v
+    - name: "Unit tests for py${{ matrix.python-version }}-django${{ matrix.django-version }}"
+      run: tox
+      env:
+        DJANGO: ${{ matrix.django-version }}
 
     - name: Upload coverage
       uses: codecov/codecov-action@v1
diff --git a/tox.ini b/tox.ini
index 1810e0e..260e4ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ deps =
     coverage
     pytest-django
     django22: Django>=2.2,<3.0
-    django31: Django>=3.1,<3.2
     django32: Django>=3.2,<4.0
     django40: Django>=4.0a1,<4.1
 
@@ -28,6 +27,12 @@ python =
     3.9: py39
     3.10: py310
 
+[gh-actions:env]
+DJANGO =
+    2.2: django22
+    3.2: django32
+    4.0: django40
+
 [testenv:py37-bandit]
 description = PyCQA security linter
 deps = bandit<1.6