Merge remote-tracking branch 'reference/master' into feature/py35_build

7fa18ba9 · Xavier Ordoquy · ed40b319 · 9cfac919 · 7fa18ba9
Commit 7fa18ba9 authored Jan 20, 2016 by Xavier Ordoquy
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

.travis.yml
+2 -1

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,8 @@ matrix:
  fast_finish: true
 install:
-  - pip install tox
+  # Virtualenv < 14 is required to keep the Python 3.2 builds running.
+  - pip install tox "virtualenv<14"
 script:
    - tox -e $TOX_ENV