From 5677795e8ff24f8e60b4fc89db6f149588c5b17f Mon Sep 17 00:00:00 2001 From: Nicolas ROCHE Date: Mon, 23 Mar 2020 15:07:15 +0100 Subject: [PATCH] python3: update tox to check against both python versions (#40911) --- Jenkinsfile | 2 +- tox.ini | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5496721..d9651bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { stages { stage('Unit Tests') { steps { - sh 'tox -rv -e coverage' + sh 'tox -rv' } post { always { diff --git a/tox.ini b/tox.ini index 9e93da9..de91cbc 100644 --- a/tox.ini +++ b/tox.ini @@ -4,11 +4,10 @@ # and then run "tox" from this directory. [tox] -toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/zoo/ -envlist = py27 +toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/zoo/{env:BRANCH_NAME:} +envlist = {py27,py3}-coverage [testenv] -basepython = python2 # django.contrib.auth is not tested it does not work with our templates whitelist_externals = /bin/mv