aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gmail.com>2015-08-08 02:07:19 -0400
committerTim Harder <radhermit@gmail.com>2015-08-08 02:07:19 -0400
commitcdd5aa71ef19ea7d3bbb805f79ba459eadd574e9 (patch)
treed890511bd1dd2c2d673db4d260be5b51137847ab /tox.ini
parentsetup: simple forgotten path join fix (diff)
downloadpkgcore-cdd5aa71ef19ea7d3bbb805f79ba459eadd574e9.tar.gz
pkgcore-cdd5aa71ef19ea7d3bbb805f79ba459eadd574e9.tar.bz2
pkgcore-cdd5aa71ef19ea7d3bbb805f79ba459eadd574e9.zip
tox: simplify travis testenv
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 5 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index ba40b18b..5a024d85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
commands =
pip install "{toxinidir}"
cp "{toxinidir}/.coveragerc" "{envsitepackagesdir}"
- py.test {posargs:-n 4 --cov pkgcore pkgcore/test}
+ py.test {posargs:-n 4 --cov-report html --cov pkgcore pkgcore/test}
[testenv:doc]
whitelist_externals = make
@@ -28,11 +28,10 @@ deps =
commands =
make -C doc {posargs:man html}
-# stub for travis-ci python nightly target tests
-[testenv:pynightly]
-# override commands so pytest-xdist isn't used since one of its deps
-# (execnet) doesn't appear to be working on py35 yet
+# stub for travis-ci
+[testenv:travis]
commands =
pip install "{toxinidir}"
cp "{toxinidir}/.coveragerc" "{envsitepackagesdir}"
- py.test {posargs:--cov pkgcore pkgcore/test}
+ py.test {posargs:-n 4 --cov-report xml --cov pkgcore pkgcore/test}
+ cp coverage.xml "{toxinidir}"