From a708d359ff123084ea64b2e53c3ad32a74711219 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 25 Nov 2015 18:52:54 -0600
Subject: remove py2-docs from tox.ini and reorder so coverage is last

---
 tox.ini | 87 +++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 41 insertions(+), 46 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 20a9ee5b1..626931faf 100644
--- a/tox.ini
+++ b/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
-- 
cgit v1.2.3


From b74126bcfd716dad9851c50464da6f01481df5e5 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Wed, 20 Jan 2016 00:17:01 -0700
Subject: Remove Python 3.2 from tox

---
 tox.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 626931faf..096600aec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,py32,py33,py34,py35,pypy,pypy3,
+    py26,py27,py33,py34,py35,pypy,pypy3,
     docs,pep8,
     {py2,py3}-cover,coverage,
 
@@ -10,7 +10,6 @@ envlist =
 basepython =
     py26: python2.6
     py27: python2.7
-    py32: python3.2
     py33: python3.3
     py34: python3.4
     py35: python3.5
-- 
cgit v1.2.3