revert tox.ini changes, leaving changes to just the matrix

Steve Piercy

2016-12-20 677ae38451980087f2d3eed2fdcd258eae25f116

revert tox.ini changes, leaving changes to just the matrix

 tox.ini

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

[testenv]
@@ -14,6 +14,7 @@
    py34: python3.4
    py35: python3.5
    pypy: pypy
    pypy3: pypy3
    py2: python2.7
    py3: python3.5

@@ -57,6 +58,12 @@
    python pyramid/scaffolds/tests.py
deps = virtualenv

[testenv:pypy3-scaffolds]
basepython = pypy3
commands =
    python pyramid/scaffolds/tests.py
deps = virtualenv

[testenv:docs]
basepython = python3.5
whitelist_externals = make