Merge pull request #330 from harlowja/fix-venvs-travis

Fix up tox envs and their usage in travis

Author: bbangert

.travis.yml

@@ -18,23 +18,31 @@ matrix:
         - python: "2.7"
     include:
         - python: "2.6"
-          env: GEVENT_VERSION=0.13.8 ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
         - python: "2.6"
-          env: GEVENT_VERSION=0.13.8 ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26
         - python: "2.6"
-          env: GEVENT_VERSION=1.0.1 ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
         - python: "2.6"
-          env: GEVENT_VERSION=1.0.1 ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent
+        - python: "2.6"
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
+        - python: "2.6"
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-eventlet
+        - python: "2.7"
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
+        - python: "2.7"
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27
         - python: "2.7"
-          env: GEVENT_VERSION=0.13.8 ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent
         - python: "2.7"
-          env: GEVENT_VERSION=0.13.8 ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent
         - python: "2.7"
-          env: GEVENT_VERSION=1.0.1 ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-eventlet
         - python: "2.7"
-          env: GEVENT_VERSION=1.0.1 ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-eventlet
         - python: "2.7"
-          env: GEVENT_VERSION=1.0.1 ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27
+          env: ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27
         - python: "3.3"
           env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
         - python: "3.3"

requirements_eventlet.txt

@@ -1 +1 @@
-eventlet>=0.16.1
+eventlet>=0.17.1

requirements_gevent.txt

@@ -1 +1 @@
-greenlet==0.4.3
+gevent>=1.0.2

tox.ini

@@ -3,7 +3,11 @@ minversion = 1.6
 skipsdist = True
 envlist = pep8,
     py26,
+    py26-gevent,
+    py26-eventlet,
     py27,
+    py27-gevent,
+    py27-eventlet,
     py33,
     py34,
     pypy
@@ -19,14 +23,20 @@ deps = -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements_sphinx.txt
 commands = {toxinidir}/ensure-zookeeper-env.sh nosetests {posargs: -d -v --with-coverage kazoo.tests}
 
-[testenv:py27]
+[testenv:py27-gevent]
 deps = {[testenv]deps}
     -r{toxinidir}/requirements_gevent.txt
+
+[testenv:py27-eventlet]
+deps = {[testenv]deps}
     -r{toxinidir}/requirements_eventlet.txt
 
-[testenv:py26]
+[testenv:py26-gevent]
 deps = {[testenv]deps}
     -r{toxinidir}/requirements_gevent.txt
+
+[testenv:py26-eventlet]
+deps = {[testenv]deps}
     -r{toxinidir}/requirements_eventlet.txt
 
 [flake8]