From b5aa30b264ecd602b178245ffae17af19cbde7ca Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Wed, 25 Apr 2018 13:58:07 -0400 Subject: [PATCH] Unbreak macOS builds on Travis --- .ci/travis-install.sh | 10 +++------- .travis.yml | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.ci/travis-install.sh b/.ci/travis-install.sh index 9121515..191b775 100755 --- a/.ci/travis-install.sh +++ b/.ci/travis-install.sh @@ -3,9 +3,8 @@ set -e -x if [ "${TRAVIS_OS_NAME}" == "osx" ]; then - git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" + brew update >/dev/null + brew upgrade pyenv eval "$(pyenv init -)" if ! (pyenv versions | grep "${PYTHON_VERSION}$"); then @@ -14,14 +13,11 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then pyenv global ${PYTHON_VERSION} pyenv rehash - brew update - brew install gnu-sed --with-default-names brew outdated libtool || brew upgrade libtool brew outdated autoconf || brew upgrade autoconf --with-default-names brew outdated automake || brew upgrade automake --with-default-names fi -pip install --upgrade pip wheel -pip install --upgrade setuptools +pip install --upgrade setuptools pip wheel pip install -r .ci/requirements.txt diff --git a/.travis.yml b/.travis.yml index b7ba7e7..a5acfa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,14 +32,14 @@ matrix: osx_image: xcode7.3 # Travis macOS env does not support Python yet, # so we have to set things up manually in install.sh. - env: BUILD=tests,wheels PYTHON_VERSION=3.5.4 PIP_USER=1 + env: BUILD=tests,wheels PYTHON_VERSION=3.5.5 branches: {only: [releases]} - os: osx osx_image: xcode7.3 # Travis macOS env does not support Python yet, # so we have to set things up manually in install.sh. - env: BUILD=tests,wheels PYTHON_VERSION=3.6.3 PIP_USER=1 + env: BUILD=tests,wheels PYTHON_VERSION=3.6.5 branches: {only: [releases]} - os: linux