Skip to content

Commit 7131b64

Browse files
committed
Merge branch 'test/travis-macos'
2 parents 1ec70c2 + e5c2a03 commit 7131b64

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.build/install_pyenv.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -Eeuxo pipefail
33

44
# pyenv installer (for macOS)
5-
# updated: 2019-05-13
5+
# updated: 2020-09-05
66

77
# use the following to enable diagnostics
88
# export PYENV_DIAGNOSE=1
@@ -15,10 +15,6 @@ if [[ "$(uname)" == "Darwin" ]]; then
1515
TRAVIS_PYTHON_VERSION="$(pyenv install --list | grep -E " ${TRAVIS_PYTHON_VERSION}(\.[0-9brc]+)+" | tail -n 1 | sed -e 's/^[[:space:]]*//')"
1616
fi
1717
pyenv install "${TRAVIS_PYTHON_VERSION}"
18-
# export PATH="${HOME}/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin:${PATH}"
19-
mkdir -p "${HOME}/.local/bin"
20-
ln -s "${HOME}/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin/python" "${HOME}/.local/bin/python"
21-
ln -s "${HOME}/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin/pip" "${HOME}/.local/bin/pip"
22-
ln -s "${HOME}/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin/coverage" "${HOME}/.local/bin/coverage"
23-
ln -s "${HOME}/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin/codecov" "${HOME}/.local/bin/codecov"
18+
pyenv global "${TRAVIS_PYTHON_VERSION}"
19+
echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n eval "$(pyenv init -)"\nfi' >> ~/.bash_profile
2420
fi

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,21 @@ jobs:
2121
language: python
2222
python: "pypy3.6-7.1.1"
2323
- os: osx
24-
osx_image: xcode11.2
24+
osx_image: xcode12u
2525
language: generic
2626
env: TRAVIS_PYTHON_VERSION="3.6"
2727
- os: osx
28-
osx_image: xcode11.2
28+
osx_image: xcode12u
2929
language: generic
3030
env: TRAVIS_PYTHON_VERSION="3.7"
3131
- os: osx
32-
osx_image: xcode11.2
32+
osx_image: xcode12u
3333
language: generic
3434
env: TRAVIS_PYTHON_VERSION="3.8"
3535

3636
before_install:
3737
- DIAGNOSE_PYENV=1 .build/install_pyenv.sh
38+
- if [[ "$(uname)" == "Darwin" ]]; then source ~/.bash_profile; fi
3839

3940
install:
4041
- pip install -U pip

0 commit comments

Comments
 (0)