From e10ae8a187876b7954d38d1968c0c8f8b6606e22 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Wed, 13 May 2015 21:08:39 +0200
Subject: [PATCH] make tox 2 compatible

---
 .travis.yml | 2 +-
 tox.ini     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc124ea4..5d7d4a5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
-  - pip install tox
+  - pip install tox==2.0.1
 script: tox -e $TOX_ENV
 notifications:
   irc:
diff --git a/tox.ini b/tox.ini
index 11b3cae8..775241b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py27,py33,py34,docs
+envlist = py{27,33,34},docs
 
 [testenv]
 basepython =
     py27: python2.7
     py33: python3.3
     py34: python3.4
+passenv = *
 usedevelop=True
 deps =
     -rdev_requirements.txt