summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-06-01 17:13:27 -0400
committerChris McDonough <chrism@plope.com>2016-06-01 17:13:27 -0400
commit3e9a737500e79a6a919ce53db9557c75d874b84c (patch)
treeef674c176ab29b9dede8a8fa70c3a18a26edde44 /tox.ini
parentb5f065906f75efdcc9f80d4f0b8b4092e92b41c0 (diff)
parent382f93e2bfec5563587e306fda3fd34759314300 (diff)
downloadpyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.gz
pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.bz2
pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini28
1 files changed, 14 insertions, 14 deletions
diff --git a/tox.ini b/tox.ini
index d29f41662..0156d9e51 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py27,py33,py34,py35,pypy,pypy3,
+ py27,py33,py34,py35,pypy,
docs,pep8,
{py2,py3}-cover,coverage,
@@ -13,7 +13,6 @@ basepython =
py34: python3.4
py35: python3.5
pypy: pypy
- pypy3: pypy3
py2: python2.7
py3: python3.5
@@ -27,14 +26,8 @@ commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
-[testenv:py32-scaffolds]
-basepython = python3.2
-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
@@ -45,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
@@ -69,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