Merge pull request #1720 from ingwinlu/fix_tox_2

make tox 2 compatible
2015-05-13 23:15:04 +02:00 · 2015-05-13 23:15:04 +02:00 · 42d2c4d26a
commit 42d2c4d26a
parent 47e468cebe e10ae8a187
2 changed files with 3 additions and 2 deletions
--- 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:
--- 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