Skip to content

Commit a828d3a

Browse files
committed
use latest osx and update pyenv script
1 parent 5e5ef79 commit a828d3a

File tree

2 files changed

+31
-13
lines changed

2 files changed

+31
-13
lines changed

.build/install_pyenv.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
set -Eeuxo pipefail
3+
4+
# pyenv installer (for macOS)
5+
# updated: 2019-05-13
6+
7+
# use the following to enable diagnostics
8+
# export PYENV_DIAGNOSE=1
9+
10+
if [[ "$(uname)" == "Darwin" ]]; then
11+
if [ -n "${DIAGNOSE_PYENV-}" ] ; then
12+
pyenv install --list
13+
fi
14+
if ! [[ ${TRAVIS_PYTHON_VERSION} =~ .*-dev$ ]] ; then
15+
TRAVIS_PYTHON_VERSION="$(pyenv install --list | grep -E " ${TRAVIS_PYTHON_VERSION}(\.[0-9brc]+)+" | tail -n 1 | sed -e 's/^[[:space:]]*//')"
16+
fi
17+
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"
24+
fi

.travis.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,26 @@ matrix:
2727
python: "3.7"
2828
env: TRAVIS_JDK_VERSION=openjdk11
2929
- os: osx
30+
osx_image: xcode11
3031
language: generic
3132
env:
3233
- TRAVIS_PYTHON_VERSION="3.5"
33-
- TRAVIS_JDK_VERSION=oraclejdk8
34+
- TRAVIS_JDK_VERSION=oraclejdk12
3435
- os: osx
36+
osx_image: xcode11
3537
language: generic
3638
env:
3739
- TRAVIS_PYTHON_VERSION="3.6"
38-
- TRAVIS_JDK_VERSION=oraclejdk8
40+
- TRAVIS_JDK_VERSION=oraclejdk12
3941
- os: osx
42+
osx_image: xcode11
4043
language: generic
4144
env:
4245
- TRAVIS_PYTHON_VERSION="3.7"
43-
- TRAVIS_JDK_VERSION=oraclejdk8
46+
- TRAVIS_JDK_VERSION=oraclejdk12
4447

4548
before_install:
46-
- |
47-
set -e
48-
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
49-
if ! [[ ${TRAVIS_PYTHON_VERSION} =~ .*-dev$ ]] ; then
50-
TRAVIS_PYTHON_VERSION="$(pyenv install --list | grep -E " ${TRAVIS_PYTHON_VERSION}(\.[0-9brc]+)+$" | tail -n 1 | sed -e 's/^[[:space:]]*//')"
51-
fi
52-
pyenv install "${TRAVIS_PYTHON_VERSION}"
53-
export PATH="${HOME}/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin:${PATH}"
54-
fi
55-
set +e
49+
- DIAGNOSE_PYENV=1 .build/install_pyenv.sh
5650
- |
5751
set -e
5852
if [[ "${TRAVIS_OS_NAME}" == "linux" && "$(lsb_release -cs)" == "trusty" ]]; then

0 commit comments

Comments
 (0)