From 6acba0bba999fddbe1156a7ee7ef5044d2adb5eb Mon Sep 17 00:00:00 2001
From: Dylan Verheul <dylan@dyve.net>
Date: Wed, 3 Nov 2021 13:43:29 +0100
Subject: [PATCH] Add support for Django 4.0 and Python 3.10

---
 .github/workflows/ci.yml |  4 ++--
 tox.ini                  | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b13d732..1ba8654 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [ 3.6, 3.7, 3.8, 3.9 ]
+        python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ]
 
     steps:
       - name: Checkout code
@@ -74,4 +74,4 @@ jobs:
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel-finished: true
\ No newline at end of file
+          parallel-finished: true
diff --git a/tox.ini b/tox.ini
index cb91bc7..8f8f462 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,9 @@ envlist =
     docs
     {py36}-{django22,django31,django32}
     {py37}-{django22,django31,django32}
-    {py38}-{django31,django32,djangomain}
-    {py39}-{django31,django32,djangomain}
+    {py38}-{django31,django32,django40,djangomain}
+    {py39}-{django31,django32,django40,djangomain}
+    {py310}-{django32,django40,djangomain}
     check-description
     check-manifest
 
@@ -21,10 +22,18 @@ deps =
     django22: Django==2.2.*
     django31: Django==3.1.*
     django32: Django==3.2.*
+    django40: Django==4.0.a1
     djangomain: https://github.com/django/django/archive/main.tar.gz
     coverage[toml]
     coveralls
 
+[testenv:coverage]
+depends =
+    py36,py37,py38,py39,py310
+commands =
+    coverage combine
+    coverage report
+ 
 [testenv:lint]
 commands =
     make lint
@@ -37,9 +46,6 @@ commands =
 deps =
     -r{toxinidir}/docs/requirements.txt
 
-# Packaging checks.
-################################################################################
-
 # Builds the package and runs 'twine check' to ensure it will render
 # correctly when uploaded to the Python Package Index, or fail if not.
 [testenv:check-description]
@@ -49,8 +55,7 @@ changedir = {toxinidir}
 skip_install = true
 deps =
   twine
-# In this environment we always want latest wheel in addition to
-# latest pip.
+# In this environment we always want latest wheel in addition to latest pip.
 commands_pre =
   {envpython} -m pip install --upgrade pip setuptools wheel
 commands =