summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDariusz Górecki <darek.krk@gmail.com>2016-07-15 17:21:44 +0100
committerDariusz Górecki <darek.krk@gmail.com>2016-07-15 17:21:44 +0100
commitd54e0ae42b0289df89b5b73722d5c11d0f13a8ba (patch)
treeef4aaf5781ccdc22323476ec5407dc4112b33d7e /tox.ini
parent744bf0565a15a40f5c04cc8b0c1fe84a2ca489da (diff)
parent37d124e64268be3a1fb82bed78c6c45eeee52140 (diff)
downloadpyramid-d54e0ae42b0289df89b5b73722d5c11d0f13a8ba.tar.gz
pyramid-d54e0ae42b0289df89b5b73722d5c11d0f13a8ba.tar.bz2
pyramid-d54e0ae42b0289df89b5b73722d5c11d0f13a8ba.zip
Merge upstream master
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini38
1 files changed, 15 insertions, 23 deletions
diff --git a/tox.ini b/tox.ini
index 626931faf..0156d9e51 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py32,py33,py34,py35,pypy,pypy3,
+ py27,py33,py34,py35,pypy,
docs,pep8,
{py2,py3}-cover,coverage,
@@ -8,14 +8,11 @@ envlist =
# Most of these are defaults but if you specify any you can't fall back
# to defaults for others.
basepython =
- py26: python2.6
py27: python2.7
- py32: python3.2
py33: python3.3
py34: python3.4
py35: python3.5
pypy: pypy
- pypy3: pypy3
py2: python2.7
py3: python3.5
@@ -23,26 +20,14 @@ commands =
pip install pyramid[testing]
nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
-[testenv:py26-scaffolds]
-basepython = python2.6
-commands =
- python pyramid/scaffolds/tests.py
-deps = virtualenv
-
[testenv:py27-scaffolds]
-basepython = python2.6
-commands =
- python pyramid/scaffolds/tests.py
-deps = virtualenv
-
-[testenv:py32-scaffolds]
-basepython = python3.2
+basepython = python2.7
commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
[testenv:py33-scaffolds]
-basepython = python3.4
+basepython = python3.3
commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
@@ -53,14 +38,14 @@ commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
-[testenv:pypy-scaffolds]
-basepython = pypy
+[testenv:py35-scaffolds]
+basepython = python3.5
commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
-[testenv:pypy3-scaffolds]
-basepython = pypy3
+[testenv:pypy-scaffolds]
+basepython = pypy
commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
@@ -77,7 +62,14 @@ basepython = python3.5
whitelist_externals = make
commands =
pip install pyramid[docs]
- make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+ make -C docs doctest html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+
+[testenv:pdf]
+basepython = python3.5
+whitelist_externals = make
+commands =
+ pip install pyramid[docs]
+ make -C docs latexpdf BUILDDIR={envdir} "SPHINXOPTS=-W -E"
# 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