diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-23 02:25:08 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-23 02:25:08 +0200 |
| commit | 74ca8a025f8b3c772512c9ce59831e7d73ddd90f (patch) | |
| tree | 17136edd35b102b82cd40065bddb9f362189dae4 | |
| parent | 3b55e544fcc25e539b1e80907abe1eb1a4e9c823 (diff) | |
| download | psutil-74ca8a025f8b3c772512c9ce59831e7d73ddd90f.tar.gz | |
attempt to fix travis + osx
| -rwxr-xr-x | .ci/travis/install.sh | 48 | ||||
| -rw-r--r-- | .travis.yml | 23 |
2 files changed, 37 insertions, 34 deletions
diff --git a/.ci/travis/install.sh b/.ci/travis/install.sh index ca90f400..5f445522 100755 --- a/.ci/travis/install.sh +++ b/.ci/travis/install.sh @@ -8,32 +8,28 @@ PYVER=`python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))'` uname -a echo $PYVER -if [[ "$(uname -s)" == 'Darwin' ]]; then - brew update - brew install python - virtualenv env -p python - source env/bin/activate - # brew update || brew update - # brew outdated pyenv || brew upgrade pyenv - # brew install pyenv-virtualenv - - # if which pyenv > /dev/null; then - # eval "$(pyenv init -)" - # fi - - # case "${PYVER}" in - # py27) - # pyenv install 2.7.10 - # pyenv virtualenv 2.7.10 psutil - # ;; - # py34) - # pyenv install 3.4.3 - # pyenv virtualenv 3.4.3 psutil - # ;; - # esac - # pyenv rehash - # pyenv activate psutil -fi +# if [[ "$(uname -s)" == 'Darwin' ]]; then +# brew update || brew update +# brew outdated pyenv || brew upgrade pyenv +# brew install pyenv-virtualenv + +# if which pyenv > /dev/null; then +# eval "$(pyenv init -)" +# fi + +# case "${PYVER}" in +# py27) +# pyenv install 2.7.10 +# pyenv virtualenv 2.7.10 psutil +# ;; +# py34) +# pyenv install 3.4.3 +# pyenv virtualenv 3.4.3 psutil +# ;; +# esac +# pyenv rehash +# pyenv activate psutil +# fi # old python versions if [[ $PYVER == '2.6' ]]; then diff --git a/.travis.yml b/.travis.yml index 746e7af3..63fcb316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,23 @@ language: python cache: pip matrix: include: - - python: 2.6 - - python: 2.7 - - python: 3.3 - - python: 3.4 - - python: 3.5 - - python: 3.6 - - "pypy" + # - python: 2.6 + # - python: 2.7 + # - python: 3.3 + # - python: 3.4 + # - python: 3.5 + # - python: 3.6 + # - "pypy" - language: generic os: osx - env: PYVER=py27 + before_install: + - brew update + - brew install python + - virtualenv env -p python + - source env/bin/activate + # - language: generic + # os: osx + # env: PYVER=py27 # - language: generic # os: osx # env: PYVER=py34 |