Restructured tox.ini

1 files changed, 29 insertions, 20 deletions

diff --git a/tox.ini b/tox.ini
index 1ada904..3ded734 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,43 +4,52 @@ envlist = py26,py27,py32,py33,py34,pypy,pypy3,flake8
 [testenv]
 commands=py.test -rsx {posargs}
 
+[testenv:base]
+deps=pytest
+	sqlalchemy
+	pymongo
+    redis
+    tornado
+    twisted
+    pytz
+    tzlocal
+
+[testenv:py2x]
+deps={[testenv:base]deps}
+    mock
+    trollius
+    funcsigs
+
 [testenv:py26]
-deps={[testenv:pypy]deps}
+deps={[testenv:py2x]deps}
     gevent
 
 [testenv:py27]
-deps={[testenv:py26]deps}
+deps={[testenv:py2x]deps}
+    gevent
 
 [testenv:py32]
-deps={[testenv:pypy]deps}
+deps={[testenv:base]deps}
+    mock
+    trollius
+    funcsigs
 
 [testenv:py33]
-deps={[testenv:py34]deps}
+deps={[testenv:base]deps}
     asyncio
 
-# Currently, cython and gevent (from https://github.com/fantix/gevent/archive/master.zip) need to be MANUALLY installed
-# in Python 3 envs because gevent tries to compile stuff even when just doing setup.py egg_info
-
 [testenv:py34]
-deps=pytest
-	sqlalchemy
-	pymongo
-    redis
-    tornado
-    twisted
-    pytz
-    tzlocal
+deps={[testenv:base]deps}
 
 [testenv:pypy]
-deps={[testenv:py34]deps}
+deps={[testenv:py2x]deps}
+
+[testenv:pypy3]
+deps={[testenv:base]deps}
     mock
     trollius
     funcsigs
 
-[testenv:pypy3]
-basepython=pypy3
-deps={[testenv:py32]deps}
-
 [testenv:flake8]
 deps=flake8
 commands=flake8 apscheduler tests