From 5e6226e1678a7feadae66f7a22f2b43925e6b36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 19 Jan 2020 19:37:20 +0100 Subject: [PATCH] python3: update tox to check against both python versions (#39092) --- tox.ini | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index f9a5ac4..c2ca908 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -envlist = py27-django111 -toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/welco/ +envlist = py27-django111-coverage-pylint,py3-django111 +toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/welco/{env:BRANCH_NAME:} [testenv] usedevelop = @@ -9,6 +9,7 @@ setenv = DJANGO_SETTINGS_MODULE=welco.settings WELCO_SETTINGS_FILE=tests/settings.py fast: FAST=--nomigrations + coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=welco/ deps = django111: django>=1.11,<1.12 pytest-cov @@ -26,5 +27,5 @@ deps = lxml git+https://git.entrouvert.org/debian/django-ckeditor.git commands = - django111: ./pylint.sh welco/ - django111: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=welco/ tests/} + pylint: ./pylint.sh welco/ + py.test {env:COVERAGE:} {posargs:tests/}