Use tox factors to clean up tox.ini

2 files changed, 7 insertions, 54 deletions

diff --git a/requirements.txt b/requirements.txt
index 1112bf9e..93a51d0e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ pylint
 sphinx
 sphinxcontrib-napoleon
 sphinxcontrib-spelling
-tox
+tox >= 1.8
diff --git a/tox.ini b/tox.ini
index dbf321ae..e51f803a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,65 +25,18 @@ commands =
 deps =
     nose
     mock
+    py26: unittest2
+    py26,py27: gevent
+    py26,py27: eventlet
+    py26,py27,py32,py33,py34: greenlet
 
-usedevelop = True
-
-[testenv:py26]
-deps =
-    {[testenv]deps}
-    unittest2
-    gevent
-    eventlet
-    greenlet
-
-[testenv:py27]
-deps =
-    {[testenv]deps}
-    gevent
-    eventlet
-    greenlet
-
-[testenv:py32]
-deps =
-    {[testenv]deps}
-    greenlet
-
-[testenv:py33]
-deps =
-    {[testenv]deps}
-    greenlet
-
-[testenv:py34]
-deps =
-    {[testenv]deps}
-    greenlet
-
-[testenv:pypy22]
-basepython = pypy2.2
-# PyPy has no C extensions
 setenv =
-    COVERAGE_NO_EXTENSION=no C extensions under PyPy
+    pypy24,pypy3_24: COVERAGE_NO_EXTENSION=no C extensions under PyPy
 
-[testenv:pypy23]
-basepython = pypy2.3
-# PyPy has no C extensions
-setenv =
-    COVERAGE_NO_EXTENSION=no C extensions under PyPy
+usedevelop = True
 
 [testenv:pypy24]
 basepython = pypy2.4
-# PyPy has no C extensions
-setenv =
-    COVERAGE_NO_EXTENSION=no C extensions under PyPy
-
-[testenv:pypy3_23]
-basepython = pypy3-2.3
-# PyPy has no C extensions
-setenv =
-    COVERAGE_NO_EXTENSION=no C extensions under PyPy
 
 [testenv:pypy3_24]
 basepython = pypy3-2.4
-# PyPy has no C extensions
-setenv =
-    COVERAGE_NO_EXTENSION=no C extensions under PyPy