Skip to content

Commit 34b62a5

Browse files
committed
Unbreak macOS build on Travis
1 parent 87f0167 commit 34b62a5

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.ci/travis-before-install.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BUILD}" == *wheels* ]]; then
2525
fi
2626

2727
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
28-
git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
29-
PYENV_ROOT="$HOME/.pyenv"
30-
PATH="$PYENV_ROOT/bin:$PATH"
28+
brew update >/dev/null
29+
brew upgrade pyenv
3130
eval "$(pyenv init -)"
3231

3332
if ! (pyenv versions | grep "${PYTHON_VERSION}$"); then
@@ -37,7 +36,6 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
3736
pyenv rehash
3837

3938
# Install PostgreSQL
40-
brew update >/dev/null
4139
if brew ls --versions postgresql@${PGVERSION} > /dev/null; then
4240
brew upgrade postgresql@${PGVERSION}
4341
else

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ matrix:
128128
apt: {packages: [postgresql-10]}
129129

130130
- os: osx
131-
env: BUILD=tests,wheels PYTHON_VERSION=3.5.2 PIP_USER=1 PGVERSION=9.6
131+
env: BUILD=tests,wheels PYTHON_VERSION=3.5.5 PGVERSION=9.6
132132

133133
- os: osx
134134
osx_image: xcode8.3
135-
env: BUILD=tests,wheels PYTHON_VERSION=3.6.1 PIP_USER=1 PGVERSION=9.6
135+
env: BUILD=tests,wheels PYTHON_VERSION=3.6.5 PGVERSION=9.6
136136

137137
allow_failures:
138138
- python: "3.7-dev"

0 commit comments

Comments
 (0)