From ee889700756e5dadf1ac75648a377186c44dcf59 Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Thu, 23 Jun 2016 11:58:11 -0500 Subject: [PATCH] use the python installer from python.org The python from brew links to brew's version of openssl while the python one works with what osx has by default. We need the later or else the resultiing app bundle only works on machines that have brew's version of openssl. --- .travis.yml | 3 +-- packaging/osx/lbry-osx-app/setup_app.sh | 2 ++ packaging/travis/setup_osx.sh | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 packaging/travis/setup_osx.sh diff --git a/.travis.yml b/.travis.yml index 1eb916926..28f830f8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,7 @@ matrix: osx_image: xcode7.3 before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade && brew install python --framework; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gmp; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./packaging/travis/setup_osx.sh; fi install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./packaging/travis/install_dependencies_and_run_tests.sh; fi diff --git a/packaging/osx/lbry-osx-app/setup_app.sh b/packaging/osx/lbry-osx-app/setup_app.sh index e1d0dd43d..8be935514 100755 --- a/packaging/osx/lbry-osx-app/setup_app.sh +++ b/packaging/osx/lbry-osx-app/setup_app.sh @@ -29,6 +29,8 @@ fi NAME=`python setup.py --name` VERSION=`python setup.py -V` pip install -r requirements.txt +# not totally sure if pyOpenSSl is needed (JIE) +pip install pyOpenSSL python setup.py install echo "Building URI Handler" diff --git a/packaging/travis/setup_osx.sh b/packaging/travis/setup_osx.sh new file mode 100755 index 000000000..aeae7824b --- /dev/null +++ b/packaging/travis/setup_osx.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -euo pipefail +set -o xtrace + +wget https://www.python.org/ftp/python/2.7.11/python-2.7.11-macosx10.6.pkg +sudo installer -pkg python-2.7.11-macosx10.6.pkg -target / +pip install -U pip +brew install gmp +