Merge pull request #2152 from mmerickel/fix/drop-py2-docs

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

.travis.yml

@@ -22,6 +22,8 @@ matrix:
           env: TOXENV=pypy3
         - python: 3.5
           env: TOXENV=py2-cover,py3-cover,coverage
+        - python: 3.5
+          env: TOXENV=docs
         - python: 3.5
           env: TOXENV=pep8
 

HACKING.txt

@@ -217,7 +217,7 @@ changed to reflect the bug fix, ideally in the same commit that fixes the bug
 or adds the feature.  To build and review docs, use the following steps.
 
 1. In the main Pyramid checkout directory, run ``./builddocs.sh`` (which just
-   turns around and runs ``tox -e py2-docs,py3-docs``)::
+   turns around and runs ``tox -e docs``)::
 
     $ ./builddocs.sh
 

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,pep8,
-    {py2,py3}-docs,
+    py26,py27,py32,py33,py34,py35,pypy,pypy3,
+    docs,pep8,
     {py2,py3}-cover,coverage,
 
 [testenv]
@@ -23,49 +23,6 @@ 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]
-    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.4
-commands =
-    coverage erase
-    coverage combine
-    coverage xml
-    coverage report --show-missing --fail-under=100
-deps =
-    coverage
-setenv =
-    COVERAGE_FILE=.coverage
-
-[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:py26-scaffolds]
 basepython = python2.6
 commands =
@@ -109,8 +66,46 @@ commands =
 deps = virtualenv
 
 [testenv:pep8]
-basepython = python3.4
+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