Merge pull request #99 from kevin-brown/update-test-matrix

Update test matrix

Author: stephrdev

.github/workflows/test.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   tests:
     name: "Python ${{ matrix.python-version }}"
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-20.04"
     services:
       redis:
         image: redis
@@ -24,7 +24,7 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: "actions/checkout@v2"
       - uses: "actions/setup-python@v2"

README.rst

@@ -36,7 +36,7 @@ Yup - `over on readthedocs.org`_.
 Supported versions
 ------------------
 
-Python 3.6+ is supported. Django 2.0+ is supported.
+Python 3.6+ is supported. Django 2.2+ is supported.
 
 
 Do you have tests?

pyproject.toml

@@ -26,12 +26,13 @@ classifiers = [
 	"Programming Language :: Python :: 3.7",
 	"Programming Language :: Python :: 3.8",
 	"Programming Language :: Python :: 3.9",
+	"Programming Language :: Python :: 3.10",
 ]
 packages = [{ include = "cacheback" }]
 include = ["LICENSE"]
 
 [tool.poetry.dependencies]
-python = ">=3.6,<4"
+python = ">=3.6.2,<4"
 importlib-metadata = {version = "*", python = "<3.8"}
 
 django = ">=2"
@@ -45,11 +46,13 @@ pytest-django = ">=4.1"
 pytest-cov = ">=2.10"
 pytest-isort = ">=1.2"
 pytest-flake8 = ">=1.0"
-pytest-black = ">=0.3"
+flake8 = "<5"
+pytest-black = {version = ">=0.3"}
 freezegun = ">=1.0"
 coverage = {version = ">=5.0", extras = ["toml"]}
 celery = ">=4"
 django-rq = ">=2"
+typing_extensions = { version = ">=3.10", python = "<3.10" }
 
 [tool.poetry.extras]
 celery = ["celery"]

tox.ini

@@ -1,26 +1,31 @@
 [tox]
 isolated_build = true
-envlist = py{36,37,38}-django{20,21,22,30,31}
+envlist =
+	py{36,37,38,39}-django{22,30,31}
+	py{36,37,38,39,310}-django{32}
+	py{38,39,310}-django{40}
 
 [gh-actions]
 python =
 	3.6: py36
 	3.7: py37
 	3.8: py38
+	3.9: py39
+	3.10: py310
 
 [testenv]
 setenv = PYTHONPATH={toxinidir}
 deps =
-	django20: Django>=2.0,<2.1
-	django21: Django>=2.1,<2.2
 	django22: Django>=2.2,<2.3
 	django30: Django>=3.0,<3.1
 	django31: Django>=3.1,<3.2
-whitelist_externals =
+	django32: Django>=3.2,<3.3
+	django40: Django>=4.0,<4.1
+allowlist_externals =
 	poetry
 	sh
 skip_install = true
 commands =
 	poetry export --dev --without-hashes -o {toxworkdir}/requirements.txt
 	sh -c 'grep -v "^[dD]jango==" {toxworkdir}/requirements.txt | poetry run pip install --no-deps -r /dev/stdin'
-	poetry run pytest --isort --flake8 --black --cov
+	pytest --isort --flake8 --black --cov