From 87a5e8ac4c3d2472766e959ceb25046bdb6b643c Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Mon, 7 Dec 2020 18:11:39 +0100 Subject: [PATCH] tox: run tests against django 2.2 (#49189) --- tox.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 0e9f680..c1d1bd5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/docbow/{env:BRANCH_NAME:} -envlist = py3-django111-{pw,pfwb}-coverage,py3-django111-mellon-coverage,py3-django11120, py3-django111-pfwbmellon-coverage +envlist = py3-{django111,django22}-{pw,pfwb}-coverage,py3-{django111,django22}-mellon-coverage,py3-django11120, py3-{django111,django22}-pfwbmellon-coverage [testenv] usedevelop = True @@ -8,6 +8,7 @@ deps = setuptools<50 M2Crypto django111: django<2 + django22: django>=2.2,<2.3 django111: django-tables2<2.0 pfwb: SQLAlchemy-Utils<0.36.7 django11120: django==1.11.20 @@ -19,7 +20,7 @@ deps = pytest-cov pytest-django pytz - django111-mellon: django-mellon + mellon: django-mellon pfwbmellon: django-mellon py3: beautifulsoup4 setenv = @@ -34,7 +35,7 @@ setenv = coverage: COVERAGE=--cov-append --cov-report xml --cov-report html --cov=docbow_project/ BRANCH_NAME={env:BRANCH_NAME:} commands = - py3: ./getlasso3.sh + ./getlasso3.sh pw: py.test {posargs: {env:COVERAGE:} --junitxml=junit-{envname}.xml tests/main/ tests/pw/} pfwb: py.test {posargs: {env:COVERAGE:} --junitxml=junit-{envname}.xml tests/main/ tests/pfwb/} mellon: py.test {posargs: {env:COVERAGE:} --junitxml=junit-{envname}.xml tests/sso/}