From f188c5b40e93d6aed603fb8c84f8999cc2b7417c Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 25 Nov 2015 18:50:32 -0600 Subject: [PATCH] run docs only against python3 --- tox.ini | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tox.ini b/tox.ini index 0b290a3..dda438a 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py26,py27,py32,py33,py34,pypy,pypy3, py27-pyramid{12,13,14,15}, - {py2,py3}-docs, + docs, {py2,py3}-cover,coverage [testenv] @@ -29,6 +29,13 @@ commands = pip install pyramid_tm[testing] nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} +[testenv:docs] +basepython = python3.4 +whitelist_externals = make +commands = + pip install pyramid_tm[docs] + make -C docs html epub BUILDDIR={envdir} + [testenv:py2-cover] commands = pip install pyramid_tm[testing] @@ -56,15 +63,3 @@ deps = coverage setenv = COVERAGE_FILE=.coverage - -[testenv:py2-docs] -whitelist_externals = make -commands = - pip install pyramid_tm[docs] - make -C docs html epub BUILDDIR={envdir} - -[testenv:py3-docs] -whitelist_externals = make -commands = - pip install pyramid_tm[docs] - make -C docs html epub BUILDDIR={envdir}