From cb17e126b78a74f9ad48f6afa05fbb7743b493e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 12 Nov 2019 14:20:07 +0100 Subject: [PATCH] tox: build py3 (#36515) --- Jenkinsfile | 7 ++++++- tox.ini | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7d7c1c307..1f77c6115 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,9 +4,14 @@ pipeline { agent any options { disableConcurrentBuilds() } stages { + stage('Unit Tests (Python 2)') { + steps { + sh 'tox -r -e py2' + } + } stage('Unit Tests') { steps { - sh 'tox -r' + sh 'tox -r -e py3-pylint-coverage' } post { always { diff --git a/tox.ini b/tox.ini index e7d45a8c4..0457fe64d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/wcs/{env:BRANCH_NAME:} -envlist = py2-pylint-coverage +envlist = py3-pylint-coverage,py2 [testenv] sitepackages = true @@ -29,6 +29,7 @@ deps = django-ratelimit<3 pyproj pylint<1.8 + py3: Quixote>=3.0 commands = - py.test {env:COVERAGE:} {posargs:tests/} + py.test -v {env:COVERAGE:} {posargs:tests/} pylint: ./pylint.sh wcs/