summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-03-08 14:44:18 -0400
committerChris McDonough <chrism@plope.com>2015-03-08 14:44:18 -0400
commit8ebde50fdc7322e82b96ad103ab168b92ca2b74a (patch)
tree3be6e2cae14d7fd3b9951111a9c98c6bb7bfb4de /tox.ini
parent5fff455548067480c820da2f64bc0b9c16a916a0 (diff)
parent6c1a1c60123d150a41fef3062df9a64b995305c5 (diff)
downloadpyramid-8ebde50fdc7322e82b96ad103ab168b92ca2b74a.tar.gz
pyramid-8ebde50fdc7322e82b96ad103ab168b92ca2b74a.tar.bz2
pyramid-8ebde50fdc7322e82b96ad103ab168b92ca2b74a.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini74
1 files changed, 57 insertions, 17 deletions
diff --git a/tox.ini b/tox.ini
index 202e29e30..e0f99e7f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,23 +1,63 @@
[tox]
-skipsdist = True
-envlist =
- py26,py27,py32,py33,py34,pypy,pypy3,cover
+envlist =
+ py26,py27,py32,py33,py34,pypy,pypy3,
+ {py2,py3}-docs,
+ {py2,py3}-cover,coverage
[testenv]
-commands =
- python setup.py -q dev
- python setup.py -q test -q
-
-[testenv:cover]
+# Most of these are defaults but if you specify any you can't fall back
+# to defaults for others.
basepython =
- python2.6
-commands =
- python setup.py -q dev
- nosetests --with-xunit --with-xcoverage
-deps =
- nosexcover
+ py26: python2.6
+ py27: python2.7
+ py32: python3.2
+ py33: python3.3
+ py34: python3.4
+ pypy: pypy
+ pypy3: pypy3
+ py2: python2.7
+ py3: python3.4
+
+commands =
+ pip install pyramid[testing]
+ nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
-# we separate coverage into its own testenv because a) "last run wins" wrt
-# cobertura jenkins reporting and b) pypy and jython can't handle any
-# combination of versions of coverage and nosexcover that i can find.
+[testenv:py2-cover]
+commands =
+ pip install pyramid[testing]
+ coverage run --source=pyramid {envbindir}/nosetests
+ coverage xml -o coverage-py2.xml
+setenv =
+ COVERAGE_FILE=.coverage.py2
+[testenv:py3-cover]
+commands =
+ pip install pyramid[testing]
+ coverage run --source=pyramid {envbindir}/nosetests
+ coverage xml -o coverage-py3.xml
+setenv =
+ COVERAGE_FILE=.coverage.py3
+
+[testenv:py2-docs]
+whitelist_externals = make
+commands =
+ pip install pyramid[docs]
+ make -C docs html
+
+[testenv:py3-docs]
+whitelist_externals = make
+commands =
+ pip install pyramid[docs]
+ make -C docs html
+
+[testenv:coverage]
+basepython = python3.4
+commands =
+ coverage erase
+ coverage combine
+ coverage xml
+ coverage report --show-missing --fail-under=100
+deps =
+ coverage
+setenv =
+ COVERAGE_FILE=.coverage