Update testing matrix (#759)

Author: kevinmarsh

.github/workflows/test.yml

@@ -9,8 +9,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy3']
-        django-version: ['2.2', '3.0', '3.1', '3.2', 'main']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.8']
+        django-version: ['2.2', '3.0', '3.1', '3.2', '4.0', 'main']
+        exclude:
+          - python-version: '3.6'
+            django-version: '4.0'
+          - python-version: '3.6'
+            django-version: 'main'
+          - python-version: '4.0'
+            django-version: 'main'
+          - python-version: '3.7'
+            django-version: '4.0'
+          - python-version: '3.7'
+            django-version: 'main'
+          - python-version: '3.10'
+            django-version: '2.2'
+          - python-version: '3.10'
+            django-version: '3.0'
+          - python-version: '3.10'
+            django-version: '3.1'
+          - python-version: '3.10'
+            django-version: '3.2'
 
     steps:
     - uses: actions/checkout@v2

tox.ini

@@ -2,7 +2,7 @@
 envlist =
   pypy3-dj{22,30,31}
   py{36,37,38,39}-dj{22,30,31,32}
-  py{38,39}-djmain
+  py{38,39,310}-dj{40,main}
   docs
 
 [gh-actions]
@@ -11,6 +11,7 @@ python =
     3.7: py37
     3.8: py38, docs
     3.9: py39
+    3.10: py310
     pypy3: pypy3
 
 [gh-actions:env]
@@ -19,6 +20,7 @@ DJANGO =
     3.0: dj30
     3.1: dj31
     3.2: dj32
+    4.0: dj40
     main: djmain
 
 [testenv]
@@ -28,12 +30,14 @@ basepython =
   py37: python3.7
   py38: python3.8
   py39: python3.9
+  py310: python3.10
 deps =
   pypy3: mock
   dj22: Django>=2.2.1,<2.3
   dj30: Django>=3.0,<3.1
   dj31: Django>=3.1,<3.2
   dj32: Django>=3.2,<3.3
+  dj40: Django>=4.0.0a1,<4.1
   djmain: https://github.com/django/django/archive/main.tar.gz
   jinja2
   coverage
@@ -51,8 +55,10 @@ commands =
     {envbindir}/coverage xml
 whitelist_externals = npm
 ignore_outcome =
+    dj40: True
     djmain: True
 ignore_errors =
+    dj40: True
     djmain: True
 
 [testenv:docs]