From e1d1385358baa0a2a7d687ca5dd7b447c002e565 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 7 May 2017 16:55:22 -0700 Subject: [PATCH] Fix travis --- .travis.yml | 2 +- tox.ini | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32060472e9..0bdde06bb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,5 +29,5 @@ cache: - $HOME/.cache/pip install: pip install -U tox coveralls language: python -script: tox +script: travis_wait tox after_success: coveralls diff --git a/tox.ini b/tox.ini index 4a51828f42..aede024620 100644 --- a/tox.ini +++ b/tox.ini @@ -9,11 +9,8 @@ setenv = ; which get read in from setup.py. If we don't force our locale to a ; utf8 one, tox's env is reset. And the install of these 2 packages ; fail. -whitelist_externals = - /usr/bin/env - /usr/bin/travis_wait -; TEMP, to get cache going on Travis :-/ -install_command = /usr/bin/env LANG=C.UTF-8 /usr/bin/travis_wait pip install {opts} {packages} +whitelist_externals = /usr/bin/env +install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages} commands = py.test --timeout=30 --duration=10 --cov --cov-report= {posargs} deps =