diff --git a/tox.ini b/tox.ini index ff3cb8f..3e28d65 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/bijoe/{env:BRANCH_NAME:} -envlist = {py2,py3}-dj111 +envlist = {py2,py3}-dj111,py3-dj22 [testenv] usedevelop = true @@ -15,6 +15,7 @@ setenv = coverage: COVERAGE=--junit-xml=test_results.xml --cov=bijoe --cov-report xml deps = dj111: django>=1.11,<1.12 + dj22: django>=2.2,<2.3 coverage pytest pytest-cov @@ -25,10 +26,11 @@ deps = mock pyquery tabulate + dj22: djangorestframework>=3.7,<3.8 py2: django-appconf<1.0.4 http://git.entrouvert.org/hobo.git/snapshot/hobo-master.tar.gz commands = - dj111: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=bijoe tests/} + py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=bijoe tests/} [pytest] filterwarnings = once:.*