Added PyPy3 as a tox test environment

1 files changed, 26 insertions, 34 deletions

diff --git a/tox.ini b/tox.ini
index b254b18..9ad2fa0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,53 +1,45 @@
 [tox]
-envlist = py26,py27,py32,py33,py34,pypy,flake8
-
-[base]
-deps=pytest
-	sqlalchemy
-	pymongo
-    redis
-    tornado
-    twisted
-    pytz
-    tzlocal
-
-[py2base]
-deps={[base]deps}
-    mock
-    trollius
-    funcsigs
-
-# Currently, cython and gevent (from https://github.com/fantix/gevent/archive/master.zip) need to be MANUALLY installed
-# because gevent tries to compile stuff even when just doing setup.py egg_info
-[py3base]
-deps={[base]deps}
+envlist = py26,py27,py32,py33,py34,pypy,pypy3,flake8
 
 [testenv]
 commands=py.test -rsx
 
 [testenv:py26]
-deps={[py2base]deps}
+deps={[testenv:pypy]deps}
     gevent
 
 [testenv:py27]
-deps={[py2base]deps}
-    gevent
-
-[testenv:pypy]
-deps={[py2base]deps}
+deps={[testenv:py26]deps}
 
 [testenv:py32]
-deps={[py3base]deps}
-    trollius
-    funcsigs
-    mock
+deps={[testenv:pypy]deps}
 
 [testenv:py33]
-deps={[py3base]deps}
+deps={[testenv:py34]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={[py3base]deps}
+deps=pytest
+	sqlalchemy
+	pymongo
+    redis
+    tornado
+    twisted
+    pytz
+    tzlocal
+
+[testenv:pypy]
+deps={[testenv:py34]deps}
+    mock
+    trollius
+    funcsigs
+
+[testenv:pypy3]
+basepython=pypy3
+deps={[testenv:py32]deps}
 
 [testenv:flake8]
 deps=flake8