aboutsummaryrefslogtreecommitdiffstats
path: root/.travis/install.sh
diff options
context:
space:
mode:
Diffstat (limited to '.travis/install.sh')
-rwxr-xr-x.travis/install.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis/install.sh b/.travis/install.sh
index 9e14a92d..7c3e9de2 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -4,10 +4,10 @@ set -e
set -x
if [[ "$(uname -s)" == 'Darwin' ]]; then
- brew update
+ brew update || brew update
if [[ "${OPENSSL}" != "0.9.8" ]]; then
- brew upgrade openssl
+ brew outdated openssl || brew upgrade openssl
fi
if which pyenv > /dev/null; then
@@ -24,22 +24,22 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
python get-pip.py --user
;;
py33)
- brew upgrade pyenv
+ brew outdated pyenv || brew upgrade pyenv
pyenv install 3.3.6
pyenv global 3.3.6
;;
py34)
- brew upgrade pyenv
+ brew outdated pyenv || brew upgrade pyenv
pyenv install 3.4.2
pyenv global 3.4.2
;;
pypy)
- brew upgrade pyenv
+ brew outdated pyenv || brew upgrade pyenv
pyenv install pypy-2.5.1
pyenv global pypy-2.5.1
;;
pypy3)
- brew upgrade pyenv
+ brew outdated pyenv || brew upgrade pyenv
pyenv install pypy3-2.4.0
pyenv global pypy3-2.4.0
;;
@@ -49,7 +49,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
;;
esac
pyenv rehash
- pip install --user virtualenv
+ python -m pip install --user virtualenv
else
pip install virtualenv
fi