From e4bec98bbea6afdac4929bfaf14d3156603c22fb Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 2 Aug 2021 17:07:45 +0200 Subject: [PATCH] tox: stop testing with python2, django 1.11 and sqlite (#55926) --- tox.ini | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tox.ini b/tox.ini index 5102531..1c71d1c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = black,coverage-py2-dj111-{pg,sqlite},coverage-py3-dj{111,22}-{pg,sqlite} +envlist = black,py3-django22-coverage toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/django-mellon/ [testenv] @@ -9,15 +9,13 @@ setenv = DJANGO_SETTINGS_MODULE=testsettings PYTHONPATH=. SETUPTOOLS_USE_DISTUTILS=stdlib - sqlite: DB_ENGINE=sqlite3 - pg: DB_ENGINE=postgresql_psycopg2 + DB_ENGINE=postgresql_psycopg2 coverage: COVERAGE=--cov=mellon --cov-branch --cov-append --cov-report xml --cov-report html usedevelop = coverage: true deps = - dj111: django>=1.11,<1.12 - dj22: django>=2.2,<2.3 - pg: psycopg2<2.9 + django22: django>=2.2,<2.3 + psycopg2<2.9 mock<4 httmock pytest @@ -30,13 +28,11 @@ deps = pytz lxml cssselect - dj111: django-webtest<1.9.3 - dj22: django-webtest>1.9.3 + django-webtest>1.9.3 WebTest pyquery commands = - py2: ./getlasso.sh - py3: ./getlasso3.sh + ./getlasso3.sh py.test -o junit_suite_name={envname} --junit-xml=junit-{envname}.xml --random {env:COVERAGE:} {posargs:tests} [testenv:pylint]