From e41c0adde5d37a5469e22eb85d096a026fe58497 Mon Sep 17 00:00:00 2001
From: Tobias Oberstein <tobias.oberstein@tavendo.de>
Date: Fri, 25 Sep 2015 17:08:20 +0200
Subject: [PATCH] bring tox/travis in sync with txaio

---
 .travis.yml | 47 +++++++++++++++++++++++++----------------------
 tox.ini     | 43 ++++++++++++++++++++++++++-----------------
 2 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3c20e921..386617e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,30 +6,30 @@ install:
 
 env:
   - TOX_ENV=flake8
-  - TOX_ENV=pypy-twtrunk
-  - TOX_ENV=pypy-trollius
-  - TOX_ENV=py27-twtrunk
-  - TOX_ENV=py27-trollius
-  - TOX_ENV=py33-twcurrent
-  - TOX_ENV=py33-twtrunk
-  - TOX_ENV=py33-trollius
-  - TOX_ENV=py34-twcurrent
-  - TOX_ENV=py34-twtrunk
-  - TOX_ENV=py34-asyncio
-# no cpy35 on travis yet! (09/12/2015)
-#  - TOX_ENV=py35-twcurrent
-#  - TOX_ENV=py35-twtrunk
-#  - TOX_ENV=py35-asyncio
-  - TOX_ENV=pypy-tw121
-  - TOX_ENV=pypy-tw132
-  - TOX_ENV=pypy-twcurrent
-  - TOX_ENV=py26-tw121
-  - TOX_ENV=py26-tw132
-  - TOX_ENV=py26-twcurrent
-  - TOX_ENV=py26-trollius
   - TOX_ENV=py27-tw121
   - TOX_ENV=py27-tw132
-  - TOX_ENV=py27-twcurrent
+  - TOX_ENV=py27-tw154
+  - TOX_ENV=py27-twtrunk
+  - TOX_ENV=py27-asyncio
+  - TOX_ENV=py34-tw154
+  - TOX_ENV=py34-twtrunk
+  - TOX_ENV=py34-asyncio
+  - TOX_ENV=pypy-tw121 
+  - TOX_ENV=pypy-tw132
+  - TOX_ENV=pypy-tw154
+  - TOX_ENV=pypy-twtrunk
+  - TOX_ENV=pypy-asyncio
+  - TOX_ENV=py26-tw121
+  - TOX_ENV=py26-tw132
+  - TOX_ENV=py26-tw154
+  - TOX_ENV=py26-asyncio
+  - TOX_ENV=py33-tw154
+  - TOX_ENV=py33-twtrunk
+  - TOX_ENV=py33-asyncio
+# Travis still lacks CPy 3.5 currently (09/25/15)  
+#  - TOX_ENV=py35-tw154
+#  - TOX_ENV=py35-twtrunk
+#  - TOX_ENV=py35-asyncio
 
 script:
   - tox -c tox.ini -e $TOX_ENV
@@ -37,6 +37,9 @@ script:
 after_script:
   - codecov
 
+matrix:
+  fast_finish: true
+
 notifications:
    irc:
       channels:
diff --git a/tox.ini b/tox.ini
index 92d73f6e..3b764abc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
 envlist =
     flake8
-    {pypy,py27,py33}-{twtrunk}
-    {pypy,py26,py27,py33}-{trollius}
-    {py34,py35}-{twtrunk,asyncio}
-    py26-{tw121,tw132,tw154}
-    {pypy,py27}-{tw121,tw132,twcurrent}
-    {py33,py34,py35}-twcurrent
+    py26-{tw121,tw132,tw154,asyncio}
+    py27-{tw121,tw132,tw154,twtrunk,asyncio}
+    pypy-{tw121,tw132,tw154,twtrunk,asyncio}
+    py33-{tw154,twtrunk,asyncio}
+    py34-{tw154,twtrunk,asyncio}
+    py35-{tw154,twtrunk,asyncio}
 
 
 [flake8]
@@ -22,38 +22,47 @@ deps =
     git+https://github.com/tavendo/txaio
 
     ; twisted dependencies
+    tw121: twisted==12.1.0
+    tw132: twisted==13.2.0
+    tw154: twisted==15.4.0
     twtrunk: https://github.com/twisted/twisted/archive/trunk.zip
-    tw121: Twisted==12.1
-    tw132: Twisted==13.2
-    tw154: Twisted==15.4
-    twcurrent: Twisted
+    {tw121,tw132,tw154,twtrunk}: pytest-twisted
 
     ; asyncio dependencies
-    asyncio,trollius: pytest
-    trollius: trollius>=0.1.2
-    trollius: futures>=2.1.5
+    py26-asyncio: trollius>=2.0
+    py26-asyncio: ordereddict
+    py27-asyncio: trollius>=2.0
+    pypy-asyncio: trollius>=2.0
+    py33-asyncio: asyncio>=3.4.3
+    asyncio: pytest
+
 commands =
     sh -c "which python"
     python -V
     coverage --version
-    asyncio,trollius: coverage run {envbindir}/py.test autobahn/
-    twtrunk,twcurrent,tw121,tw132,twcurrent: coverage run {envbindir}/trial autobahn
+    asyncio: coverage run {envbindir}/py.test autobahn/
+    tw121,tw132,tw154,twtrunk: coverage run {envbindir}/trial autobahn
     coverage report
+
 whitelist_externals = sh
+
 setenv =
-   asyncio,trollius: USE_ASYNCIO = 1
-   twtrunk,twcurrent,tw121,tw132,twcurrent: USE_TWISTED = 1
+   asyncio: USE_ASYNCIO = 1
+   tw121,tw132,tw154,twtrunk: USE_TWISTED = 1
 
 
 [testenv:flake8]
 skip_install = True
+
 deps =
    flake8
    pep8-naming
+
 commands =
    sh -c "which python"
    python -V
    flake8 --version
    ; These ignores will be removed when they are fixed and we are flake8-clean
    flake8 --ignore=E501,N801,N802,N803,N805,N806 autobahn
+
 basepython = python2.7