Merge remote-tracking branch 'upstream/master'

Supervisor · Feb 13, 2016 · 48d6937 · 48d6937
2 parents a61019c + 4351c81
commit 48d6937
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.coverage b/.coverage
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ env:
     - TOXENV=py34
     - TOXENV=pypy
 install:
-    - travis_retry pip install tox==1.6.1
+    # "virtualenv<14.0.0" is needed for Python 3.2 compat
+    - travis_retry pip install "virtualenv<14.0.0" tox
 script:
     - travis_retry tox