python3: update tox to check against both python versions (#39092)
This commit is contained in:
parent
a78e567583
commit
5e6226e167
9
tox.ini
9
tox.ini
|
@ -1,6 +1,6 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = py27-django111
|
envlist = py27-django111-coverage-pylint,py3-django111
|
||||||
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/welco/
|
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/welco/{env:BRANCH_NAME:}
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop =
|
usedevelop =
|
||||||
|
@ -9,6 +9,7 @@ setenv =
|
||||||
DJANGO_SETTINGS_MODULE=welco.settings
|
DJANGO_SETTINGS_MODULE=welco.settings
|
||||||
WELCO_SETTINGS_FILE=tests/settings.py
|
WELCO_SETTINGS_FILE=tests/settings.py
|
||||||
fast: FAST=--nomigrations
|
fast: FAST=--nomigrations
|
||||||
|
coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=welco/
|
||||||
deps =
|
deps =
|
||||||
django111: django>=1.11,<1.12
|
django111: django>=1.11,<1.12
|
||||||
pytest-cov
|
pytest-cov
|
||||||
|
@ -26,5 +27,5 @@ deps =
|
||||||
lxml
|
lxml
|
||||||
git+https://git.entrouvert.org/debian/django-ckeditor.git
|
git+https://git.entrouvert.org/debian/django-ckeditor.git
|
||||||
commands =
|
commands =
|
||||||
django111: ./pylint.sh welco/
|
pylint: ./pylint.sh welco/
|
||||||
django111: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=welco/ tests/}
|
py.test {env:COVERAGE:} {posargs:tests/}
|
||||||
|
|
Loading…
Reference in New Issue