Updated tox.ini to properly work with the latest versions of dependencies

1 files changed, 19 insertions, 5 deletions

diff --git a/tox.ini b/tox.ini
index eafc63d..430b842 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,11 +8,10 @@ deps = pytest
 	sqlalchemy
 	pymongo
     redis
-    rethinkdb
     tornado
-    twisted
     pytz
     tzlocal
+    gevent >= 1.1rc1
 
 [testenv:py2x]
 deps = {[testenv]deps}
@@ -22,14 +21,14 @@ deps = {[testenv]deps}
 
 [testenv:py26]
 deps = {[testenv:py2x]deps}
-    gevent
+    twisted < 15.0
 
 [testenv:py27]
 deps = {[testenv:py2x]deps}
-    gevent
+    twisted
 
 [testenv:py32]
-deps={[testenv:base]deps}
+deps={[testenv]deps}
     mock
     trollius
     funcsigs
@@ -37,9 +36,24 @@ deps={[testenv:base]deps}
 [testenv:py33]
 deps = {[testenv]deps}
     asyncio
+    twisted
+
+[testenv:py34]
+deps = {[testenv]deps}
+    twisted
+
+[testenv:py35]
+deps = {[testenv]deps}
+    twisted
 
 [testenv:pypy]
 deps = {[testenv:py2x]deps}
+    twisted
+
+[testenv:pypy3]
+deps = {[testenv]deps}
+    mock
+    twisted
 
 [testenv:flake8]
 deps = flake8