From dd195a31f224855f0ab3c792fae74ddfeedc9384 Mon Sep 17 00:00:00 2001
From: David Szotten <davidszotten@gmail.com>
Date: Sat, 20 Dec 2014 13:51:18 +0000
Subject: Tests: tidy up tox file

using new multi-dimensional support in 1.8

also update travis file

Closes GH #180
---
 tox.ini | 144 ++++++++++------------------------------------------------------
 1 file changed, 21 insertions(+), 123 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 840582b..48c980e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,141 +15,39 @@ statistics = 1
 
 [tox]
 envlist =
-    pep8,
-    py26selects,py26poll,py26epolls,
-    py27selects,py27poll,py27epolls,
-    py33selects,py33poll,py33epolls,
-    py34selects,py34poll,py34epolls,
-    pypyselects,pypypoll,pypyepolls,
+    pep8, {py26,py27,py33,py34,pypy}-{selects,poll,epolls}
+
+[testenv:pep8]
+basepython = python2.7
+setenv =
+    {[testenv]setenv}
+deps =
+    pep8==1.5.6
+commands =
+    pep8 benchmarks/ eventlet/ tests/
 
 [testenv]
 downloadcache = {toxworkdir}/pip_download_cache
 setenv =
     PYTHONDONTWRITEBYTECODE = 1
+    selects: EVENTLET_HUB = selects
+    poll: EVENTLET_HUB = poll
+    epolls: EVENTLET_HUB = epolls
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    pypy: pypy
 deps =
     nose==1.3.1
     psycopg2cffi-compat==1.1
     pyopenssl==0.13
     pyzmq==13.1.0
     setuptools==5.4.1
+    py26: MySQL-python==1.2.5
+    py27: MySQL-python==1.2.5
 commands =
     nosetests --verbose tests/
     nosetests --verbose --with-doctest eventlet/coros.py eventlet/event.py \
         eventlet/pools.py eventlet/queue.py eventlet/timeout.py
-
-[testenv:pep8]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-deps =
-    pep8==1.5.6
-commands =
-    pep8 benchmarks/ eventlet/ tests/
-
-[testenv:py26selects]
-basepython = python2.6
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py26poll]
-basepython = python2.6
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py26epolls]
-basepython = python2.6
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py27selects]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py27poll]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py27epolls]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py33selects]
-basepython = python3.3
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-
-[testenv:py33poll]
-basepython = python3.3
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-
-[testenv:py33epolls]
-basepython = python3.3
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-
-[testenv:py34selects]
-basepython = python3.4
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-
-[testenv:py34poll]
-basepython = python3.4
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-
-[testenv:py34epolls]
-basepython = python3.4
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-
-[testenv:pypyselects]
-basepython = pypy
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-
-[testenv:pypypoll]
-basepython = pypy
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-
-[testenv:pypyepolls]
-basepython = pypy
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-- 
cgit v1.2.1