diff --git a/tox.ini b/tox.ini index dd352e0..bf77378 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,14 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/docbow/{env:BRANCH_NAME:} -envlist = py3-{django111,django22}-{pw,pfwb}-coverage,py3-{django111,django22}-mellon-coverage,py3-django11120, py3-{django111,django22}-pfwbmellon-coverage, black +envlist = py3-django22-{pw,pfwb}-coverage,py3-django22-mellon-coverage,py3-django22-pfwbmellon-coverage, black [testenv] usedevelop = True 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 - django11120: django-tables2<2.0 django-webtest mock<4 psycopg2<2.9 @@ -28,7 +24,6 @@ setenv = SECRET_KEY=changeme pw: PARLEMENT=pw pfwb: PARLEMENT=pfwb - django11120: PARLEMENT=pw DJANGO_SETTINGS_MODULE=docbow_project.settings DOCBOW_SETTINGS_FILE=tests/settings.py mellon: DOCBOW_SETTINGS_FILE=tests/sso/settings.py @@ -40,6 +35,5 @@ commands = 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/} - django11120: py.test {posargs: --junitxml=junit-{envname}.xml tests/main/test_main.py} pfwbmellon: py.test {posargs: {env:COVERAGE:} --junitxml=junit-{envname}.xml tests/pfwbmellon/} black: pre-commit run black --all-files --show-diff-on-failure