Merge branch 'master' into feature/more-samesite-work

1 files changed, 13 insertions, 6 deletions

diff --git a/tox.ini b/tox.ini
index 50ff4f166..758d4216b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint,
-    py27,py34,py35,py36,pypy,
+    py27,py34,py35,py36,pypy,pypy3,
     docs,{py2,py3}-cover,coverage,
 
 [testenv]
@@ -14,13 +14,16 @@ basepython =
     py36: python3.6
     py37: python3.7
     pypy: pypy
+    pypy3: pypy3
     py2: python2.7
     py3: python3.5
 
 commands =
-    pip install -q pyramid[testing]
     nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
 
+extras =
+    testing
+
 [testenv:py27-scaffolds]
 basepython = python2.7
 commands =
@@ -67,34 +70,38 @@ deps =
 basepython = python3.5
 whitelist_externals = make
 commands =
-    pip install pyramid[docs]
     make -C docs doctest html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+extras =
+    docs
 
 [testenv:pdf]
 basepython = python3.5
 whitelist_externals = make
 commands =
-    pip install pyramid[docs]
     make -C docs latexpdf BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+extras =
+    docs
 
 # 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 -q pyramid[testing]
     coverage run --source=pyramid {envbindir}/nosetests
     coverage xml -o coverage-py2.xml
 setenv =
     COVERAGE_FILE=.coverage.py2
+extras =
+    testing
 
 [testenv:py3-cover]
 commands =
-    pip install -q pyramid[testing]
     coverage run --source=pyramid {envbindir}/nosetests
     coverage xml -o coverage-py3.xml
 setenv =
     COVERAGE_FILE=.coverage.py3
+extras =
+    testing
 
 [testenv:coverage]
 skip_install = True