summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2020-01-19 18:37:20 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2020-01-19 18:59:00 (GMT)
commitfbc3c6541f6361c13f372d804934a1c289702813 (patch)
treeaa40654eeb56143ca81258b0c8a90e07fa245346
parent2b3b7c770720cdc5d81dc147b3e0a2db29f1f837 (diff)
downloadwelco-wip/39092-python3.zip
welco-wip/39092-python3.tar.gz
welco-wip/39092-python3.tar.bz2
python3: update tox to check against both python versionswip/39092-python3
-rw-r--r--Jenkinsfile2
-rw-r--r--tox.ini13
2 files changed, 8 insertions, 7 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index f577237..86e03fa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
utils.publish_coverage_native('index.html')
utils.publish_pylint('pylint.out')
}
- junit '*_results.xml'
+ mergeJunitResults()
}
}
}
diff --git a/tox.ini b/tox.ini
index f9a5ac4..59e23b2 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,12 +9,13 @@ 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
pytest-django
- pytest<4.1
- attrs<19.2
+ pytest!=5.3.3
+ attrs
WebTest
mock
httmock
@@ -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/}