diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2015-08-04 02:26:29 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2015-08-04 02:26:29 +0200 |
commit | 29aad0a5becffa8a141d0ce0e48492e1a39eaca6 (patch) | |
tree | 7e998caf073a4cb790ed8392adee4acc01f77494 /.travis.yml | |
parent | 2d2bfe6de68bc375453247058776d9d92358eb8f (diff) | |
download | psutil-29aad0a5becffa8a141d0ce0e48492e1a39eaca6.tar.gz |
attempt some fixes for OSX/travis failures; also update HISTORY/CREDITS with @mrjefftang contributions
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index e355449b..d883c653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ sudo: false - language: python - matrix: include: - python: 2.6 @@ -24,10 +22,9 @@ matrix: - language: generic os: osx env: PYVER=py34 - install: - - ./.travis/install.sh + - ./.ci/travis/install.sh script: - - ./.travis/run.sh + - ./.ci/travis/run.sh after_success: - coveralls # upload reports to coveralls.io |