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

This commit is contained in:
Xavier Ordoquy 2016-01-20 14:12:05 +01:00
commit 7fa18ba939

View File

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