Fix up tox envs and there usage in travis

Ensure that we have specific virtualenvs listed in tox
that install the desired gevent versions and ensure that the
.travis.yml file references them for usage.

This also adds gevent (with no version restriction) to the py27, py26
builds and also adds eventlet (which is now py3.x compat) to the py33
and py34 builds so that we know it is working as expected.

Fixes issue #328

Author: Joshua Harlow

.travis.yml

@@ -6,23 +6,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-0.13.8
         - 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-0.13.8
+        - python: "2.6"
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent-1.0.1
+        - python: "2.6"
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent-1.0.1
+        - 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-0.13.8
         - 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-0.13.8
         - 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-gevent-1.0.1
         - 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-gevent-1.0.1
         - 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-gevent-1.0.1
         - 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.4

tox.ini

@@ -3,7 +3,11 @@ minversion = 1.6
 skipsdist = True
 envlist = pep8,
     py26,
+    py26-gevent-0.13.8,
+    py26-gevent-1.0.1,
     py27,
+    py27-gevent-0.13.8,
+    py27-gevent-1.0.1,
     py33,
     py34,
     pypy
@@ -19,15 +23,47 @@ 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:py34]
+deps = {[testenv]deps}
+    -r{toxinidir}/requirements_eventlet.txt
+
+[testenv:py33]
+deps = {[testenv]deps}
+    -r{toxinidir}/requirements_eventlet.txt
+
 [testenv:py27]
 deps = {[testenv]deps}
     -r{toxinidir}/requirements_gevent.txt
     -r{toxinidir}/requirements_eventlet.txt
+    gevent
+
+[testenv:py27-gevent-0.13.8]
+deps = {[testenv]deps}
+    -r{toxinidir}/requirements_gevent.txt
+    gevent==0.13.8
+
+[testenv:py27-gevent-1.0.1]
+deps = {[testenv]deps}
+    -r{toxinidir}/requirements_gevent.txt
+    gevent==1.0.1
 
 [testenv:py26]
 deps = {[testenv]deps}
     -r{toxinidir}/requirements_gevent.txt
     -r{toxinidir}/requirements_eventlet.txt
+    gevent
+
+[testenv:py26-gevent-0.13.8]
+deps = {[testenv]deps}
+    -r{toxinidir}/requirements_gevent.txt
+    -r{toxinidir}/requirements_eventlet.txt
+    gevent==0.13.8
+
+[testenv:py26-gevent-1.0.1]
+deps = {[testenv]deps}
+    -r{toxinidir}/requirements_gevent.txt
+    -r{toxinidir}/requirements_eventlet.txt
+    gevent==1.0.1
 
 [flake8]
 builtins = _