remove py2-docs from tox.ini and reorder so coverage is last

Michael Merickel

2015-11-26 04d2ae7416122ccb6a99c25a32b3c05bf2cb51e6

remove py2-docs from tox.ini and reorder so coverage is last

 HACKING.txt

@@ -234,7 +234,7 @@
    $ git pull

3. Change back to the main Pyramid checkout dir and run ``./builddocs`` (which
   just turns around and runs ``tox -e py2-docs,py3-docs``)::
   just turns around and runs ``tox -e docs``)::

    $ ./builddocs


 builddocs.sh

@@ -1,3 +1,3 @@
#!/bin/bash
tox -epy2-docs,py3-docs
tox -e docs


 tox.ini

@@ -1,7 +1,7 @@
[tox]
envlist =
    py26,py27,py32,py33,py34,py35,pypy,pypy3,
    {py2,py3}-docs,
    docs,pep8,
    {py2,py3}-cover,coverage,

[testenv]
@@ -22,46 +22,6 @@
commands =
    pip install pyramid[testing]
    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}

[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 epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"

[testenv:py3-docs]
whitelist_externals = make
commands =
    pip install pyramid[docs]
    make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"

[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

[testenv:py26-scaffolds]
basepython = python2.6
@@ -104,3 +64,48 @@
commands =
    python pyramid/scaffolds/tests.py
deps = virtualenv

[testenv:pep8]
basepython = python3.5
commands =
    flake8 pyramid/
deps =
    flake8

[testenv:docs]
basepython = python3.5
whitelist_externals = make
commands =
    pip install pyramid[docs]
    make -C docs html epub 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
# 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:coverage]
basepython = python3.5
commands =
    coverage erase
    coverage combine
    coverage xml
    coverage report --show-missing --fail-under=100
deps =
    coverage
setenv =
    COVERAGE_FILE=.coverage