From aab76567662f770ed763c6ae25be1cbe8d9fd3cf Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 11 Mar 2018 20:47:25 +0000 Subject: [PATCH] Travis: python on OS X conflicts with python3 now? --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8d9b217..5f38dd93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,7 +114,8 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew config; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install swig python3 icu4c jq qt5 gettext; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install swig icu4c jq qt5 gettext; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated python || brew upgrade python; fi - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_WITH" == "cmake" ]]; then brew outdated cmake || brew upgrade cmake; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew info --json=v1 --installed | jq .; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PKG_CONFIG_PATH="$(brew --prefix qt5)/lib/pkgconfig:$PKG_CONFIG_PATH"; fi