From 9f38e87a584886672ade730eaadc12b138f52083 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Wed, 27 Oct 2021 12:16:26 +0200
Subject: [PATCH] Update Python and Django versions in tox.ini (#307)

* Update Python and Django versions in tox.ini

- remove Django 3.1
- add Django 4.0b1
- add Python 3.10

* Add python 3.10  in github action matrix

* Update tox.ini from django-debug-toolbar

* Fix whitespaces

* Add missing setup classifiers

* Fix typo in tox.ini

* Remove django 4 classifier
---
 .github/workflows/test.yml |  2 +-
 setup.py                   |  1 +
 tox.ini                    | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8a8e8d4..7dac317 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy3']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy3']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/setup.py b/setup.py
index 57e8faf..cd39737 100644
--- a/setup.py
+++ b/setup.py
@@ -58,6 +58,7 @@ setup(
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
     ],
diff --git a/tox.ini b/tox.ini
index 57e0dde..b4a83a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,9 @@ minversion = 1.8
 whitelist_externals = sphinx-build
 envlist =
     py36-checkqa
-    py{36,37,38,39,py3}-dj{22,30,31,32}
-    py{38,39}-djmain
+    py{36,37,py3}-dj{22,31,32}
+    py{38,39}-dj{22,31,32,40,main}
+    py{310}-dj{40,main}
 
 [gh-actions]
 python =
@@ -14,6 +15,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
     pypy3: pypy3
 
 [testenv]
@@ -24,9 +26,9 @@ setenv =
     COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
 deps =
     dj22: django~=2.2.17
-    dj30: django~=3.0.11
     dj31: django~=3.1.3
-    dj32: https://github.com/django/django/archive/stable/3.2.x.tar.gz
+    dj32: django~=3.2.0
+    dj40: django>=4.0b1,<4.1
     djmain: https://github.com/django/django/archive/main.tar.gz
     coverage
     coverage_enable_subprocess