Skip to content

Commit

Permalink
Fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
balloob committed May 7, 2017
1 parent bafc04c commit e1d1385
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 2 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit e1d1385

Please sign in to comment.