summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlton Gibson <carlton.gibson@noumenal.es>2021-11-22 12:13:58 +0100
committerGitHub <noreply@github.com>2021-11-22 12:13:58 +0100
commitb9e476932fbee30dfd62573e04484dec73508da8 (patch)
treed2dcf3696c30ccfa178900440a4e5d5808fab104
parent73eae6a52d6aa0bf31b4dbc976ecef4c90c34c4a (diff)
downloaddjango-compressor-b9e476932fbee30dfd62573e04484dec73508da8.tar.gz
Added Django 4.0 to test matrix. (#1072)
* Added Django 4.0 to test matrix. * Switched to `django-admin` (without `.py` suffix) for test commands. The old aliases are Removed in Django 4.0.
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--Makefile2
-rw-r--r--tox.ini4
3 files changed, 10 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e72695..d0c9629 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,12 @@ jobs:
- python: 3.9
toxenv: py39-3.2.X
+ - python: 3.8
+ toxenv: py38-4.0.X
+ - python: 3.9
+ toxenv: py39-4.0.X
+
+
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index 2ee627d..9ea1fce 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ flake8:
flake8 compressor --ignore=E501,E128,E701,E261,E301,E126,E127,E131,E402,W503
runtests:
- coverage run --branch --source=compressor `which django-admin.py` test --settings=compressor.test_settings compressor
+ coverage run --branch --source=compressor `which django-admin` test --settings=compressor.test_settings compressor
coveragereport:
coverage report --omit=compressor/test*
diff --git a/tox.ini b/tox.ini
index 5921de2..27c3b7a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist =
{py36,py37,py38,py39}-3.0.X
{py36,py37,py38,py39}-3.1.X
{py36,py37,py38,py39}-3.2.X
+ {py38,py39}-4.0.X
[testenv]
basepython =
py35: python3.5
@@ -16,11 +17,12 @@ setenv =
CPPFLAGS=-O0
whitelist_externals = /usr/bin/make
commands =
- django-admin.py --version
+ django-admin --version
make test
deps =
2.2.X: Django>=2.2,<2.3
3.0.X: Django>=3.0,<3.1
3.1.X: Django>=3.1,<3.2
3.2.X: Django>=3.2,<4.0
+ 4.0.X: Django>=4.0a1,<5.0
-r{toxinidir}/requirements/tests.txt