From 48bc21de04632a94fe6b6658f79501158a98bb89 Mon Sep 17 00:00:00 2001 From: Roddie Kieley Date: Tue, 6 Mar 2018 14:31:48 -0330 Subject: [PATCH] PROTON-1787: Pinned the homebrew python version to 2 to stay current with current change to default of python to python 3 in homebrew. --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d75c5e42c..c769d4730b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,20 +37,22 @@ matrix: env: - PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig' - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DBUILD_PERL=OFF -DBUILD_RUBY=OFF' + - PATH=/usr/local/opt/python@2/libexec/bin:$PATH before_install: - brew update - brew upgrade python openssl - - brew install libuv swig + - brew install python@2 libuv swig - os: osx osx_image: xcode9 env: - PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig' - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_PERL=OFF -DBUILD_RUBY=OFF' + - PATH=/usr/local/opt/python@2/libexec/bin:$PATH before_install: - brew update - brew upgrade python openssl - - brew install libuv swig + - brew install python@2 libuv swig # Note addons is apt specific at the moment and will not be applied for osx. # See before_install brew commands below @@ -72,8 +74,8 @@ addons: - lcov install: -- pip2 install --user --upgrade pip -- pip2 install --user coverage tox +- pip install --user --upgrade pip +- pip install --user coverage tox - gem install minitest before_script: