diff options
| author | Chris McDonough <chrism@plope.com> | 2015-04-24 06:52:55 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-04-24 06:52:55 -0400 |
| commit | d2c49d66399e8caa0509822cab189c04d3f7ec35 (patch) | |
| tree | f8f5663ca51ac47fb35732364b96990cd9cd42b4 /tox.ini | |
| parent | bedd5f21f6f2c7660824cf901c24a31cad8f737d (diff) | |
| parent | 43857c97c5c5cf437b31be013c6540ffc536d803 (diff) | |
| download | pyramid-d2c49d66399e8caa0509822cab189c04d3f7ec35.tar.gz pyramid-d2c49d66399e8caa0509822cab189c04d3f7ec35.tar.bz2 pyramid-d2c49d66399e8caa0509822cab189c04d3f7ec35.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 38 |
1 files changed, 24 insertions, 14 deletions
@@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,pypy3, + py26,py27,py32,py33,py34,pypy,pypy3,pep8, {py2,py3}-docs, {py2,py3}-cover,coverage, @@ -22,6 +22,9 @@ 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] @@ -38,21 +41,9 @@ commands = 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 = +commands = coverage erase coverage combine coverage xml @@ -62,6 +53,18 @@ deps = setenv = COVERAGE_FILE=.coverage +[testenv:py2-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html epub BUILDDIR={envdir} + +[testenv:py3-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html epub BUILDDIR={envdir} + [testenv:py26-scaffolds] basepython = python2.6 commands = @@ -103,3 +106,10 @@ basepython = pypy3 commands = python pyramid/scaffolds/tests.py deps = virtualenv + +[testenv:pep8] +basepython = python3.4 +commands = + flake8 pyramid/ +deps = + flake8 |