diff --git a/tox.ini b/tox.ini index 54f5762..9466238 100644 --- a/tox.ini +++ b/tox.ini @@ -6,14 +6,14 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic2-wallonie-connect/{env:BRANCH_NAME:} envlist = - py3-dj111-drf39 - py3-dj22-drf39 + py3-dj22-drf39-djfilter21 + py3-dj22-drf312-djfilter24 [tox:jenkins] envlist = pylint - py3-dj111-drf39 - py3-dj22-drf39 + py3-dj22-drf39-djfilter21 + py3-dj22-drf312-djfilter24 [testenv] setenv = @@ -36,11 +36,12 @@ deps = https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz # dependency constraints for authentic drf39: djangorestframework>=3.9.2,<3.10 - dj111: django<2.0 - dj22: django<2.3 + drf312: djangorestframework>=3.12,<3.13 + django<2.3 django-tables<2.0 psycopg2-binary<2.9 - py3: django-filter<2.3 + djfilter21: django-filter>=2.1,<2.2 + djfilter24: django-filter>=2.4,<2.5 chardet<4 # pytest requirements @@ -58,7 +59,7 @@ commands = usedevelop = true deps = https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz - Django<2.3 + django<2.3 pylint pylint-django psycopg2-binary