Updated travis.yml, tox.ini

bjmb · bjmb · commit f1058cbbe5e2 · 2017-04-21T14:07:50.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,16 @@
 language: python
-python: 2.7
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "pypy-5.4.1"
+
 sudo: false
 env:
-  - TOX_ENV=py27 CASS_VER=12 CASS_DRIVER_NO_CYTHON=1
-  - TOX_ENV=py27 CASS_VER=20 CASS_DRIVER_NO_CYTHON=1
-  - TOX_ENV=py27 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
-  - TOX_ENV=py27 CASS_VER=21
-  - TOX_ENV=py33 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
-  - TOX_ENV=py33 CASS_VER=21
-  - TOX_ENV=py34 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
-  - TOX_ENV=py34 CASS_VER=21
-  - TOX_ENV=pypy CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
+  - CASS_DRIVER_NO_CYTHON=1
+  - 
 
 addons:
   apt:
@@ -22,7 +22,8 @@ addons:
     - libev-dev
 
 install:
-  - pip install tox
+  - pip install tox-travis
 
 script:
-  - tox -e $TOX_ENV
+  - tox
+  - tox -e patched_loops
diff --git a/tox.ini b/tox.ini
@@ -20,20 +20,7 @@ changedir = {envtmpdir}
 commands = nosetests --verbosity=2 --no-path-adjustment {toxinidir}/tests/unit/
 
 
-[testenv:py27]
-deps = {[base]deps}
-       gevent
-
-setenv = LIBEV_EMBED=0
-         CARES_EMBED=0
-         MONKEY_PATCH_LOOP=1
-changedir = {envtmpdir}
-commands =
-       nosetests --verbosity=2 --no-path-adjustment {toxinidir}/tests/unit/io/test_eventletreactor.py
-       nosetests --verbosity=2 --no-path-adjustment {toxinidir}/tests/unit/io/test_geventreactor.py
-
-
-[testenv:py34]
+[testenv:patched_loops]
 deps = {[base]deps}
        gevent
 
