diff options
| author | Marco Hinz <mh.codebro+github@gmail.com> | 2018-03-04 01:11:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 01:11:09 +0100 |
| commit | 90fc7c6ad0d502b859bb20094820b937cacdcb8e (patch) | |
| tree | 75d0852a1412408797b8022905c0187c9b285b40 | |
| parent | c21cf6d3cc74b1ccb27a3f49060497f52c044aaf (diff) | |
| download | rneovim-90fc7c6ad0d502b859bb20094820b937cacdcb8e.tar.gz rneovim-90fc7c6ad0d502b859bb20094820b937cacdcb8e.tar.bz2 rneovim-90fc7c6ad0d502b859bb20094820b937cacdcb8e.zip | |
ci: the homebrew formula for Python 3 was renamed (#8094)
Homebrew changed a few formulae to meet their standards. "python3" was renamed
to "python", and "python2" to "python@2".
As for why, read this announcement: https://brew.sh/2018/01/19/homebrew-1.5.0
Since we install Python 3 via homebrew anyway, we now do the same for Python 2
as well. We do that because the system Python 2 of macOS comes without pip
installed and this way seems cleaner than doing "sudo easy_install pip".
The Python 2 formula is keg-only now, so it doesn't interfere with the system
Python 2. Therefore we have to add its executables to $PATH ourselves.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/before_install.sh | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 0c1f7da9ec..565d4098b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,9 +72,11 @@ jobs: - os: osx compiler: clang osx_image: xcode7.3 # macOS 10.11 + env: PATH="/usr/local/opt/python@2/bin:$PATH" - os: osx compiler: gcc osx_image: xcode7.3 # macOS 10.11 + env: PATH="/usr/local/opt/python@2/bin:$PATH" - os: linux env: CI_TARGET=lint - stage: Flaky builds diff --git a/ci/before_install.sh b/ci/before_install.sh index 9f512ee5b9..f696b85afc 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -23,12 +23,17 @@ echo 'python info:' 2>&1 pyenv versions || true ) | sed 's/^/ /' +if [[ "${TRAVIS_OS_NAME}" == osx ]]; then + echo "Install Python 2." + brew install python@2 +fi + echo "Upgrade Python 2 pip." pip2.7 -q install --user --upgrade pip if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - echo "Install Python 3." - brew install python3 + echo "Upgrade Python 3." + brew upgrade python echo "Upgrade Python 3 pip." pip3 -q install --user --upgrade pip else |