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.
This commit is contained in:
Job Evers-Meltzer 2016-06-23 11:58:11 -05:00
parent f5fa40feb7
commit ee88970075
3 changed files with 13 additions and 2 deletions

View file

@ -15,8 +15,7 @@ matrix:
osx_image: xcode7.3 osx_image: xcode7.3
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade && brew install python --framework; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./packaging/travis/setup_osx.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gmp; fi
install: install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./packaging/travis/install_dependencies_and_run_tests.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./packaging/travis/install_dependencies_and_run_tests.sh; fi

View file

@ -29,6 +29,8 @@ fi
NAME=`python setup.py --name` NAME=`python setup.py --name`
VERSION=`python setup.py -V` VERSION=`python setup.py -V`
pip install -r requirements.txt pip install -r requirements.txt
# not totally sure if pyOpenSSl is needed (JIE)
pip install pyOpenSSL
python setup.py install python setup.py install
echo "Building URI Handler" echo "Building URI Handler"

10
packaging/travis/setup_osx.sh Executable file
View file

@ -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