Merge pull request #351 from lbryio/ssl-handshake

Fix SSL handshake issue
This commit is contained in:
Job Evers‐Meltzer 2016-12-16 19:25:00 -06:00 committed by GitHub
commit 83e797d7f6
2 changed files with 31 additions and 12 deletions

View file

@ -48,24 +48,38 @@ pip install $MODULES
pip install dmgbuild==1.1.0 pip install dmgbuild==1.1.0
export PATH=${PATH}:/Library/Frameworks/Python.framework/Versions/2.7/bin export PATH=${PATH}:/Library/Frameworks/Python.framework/Versions/2.7/bin
pip install jsonrpc certifi # pyopenssl is needed because OSX ships an old version of openssl by default
# and python will use it without pyopenssl
# the default py2app (v0.9) has a bug that is fixed in the head of /metachris/py2app pip install PyOpenSSL jsonrpc certifi
pip install git+https://github.com/metachris/py2app
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
pip install pylint
./run_pylint.sh packaging/osx/lbry-osx-app/lbrygui/ if [ -z ${SKIP_PYLINT+x} ]; then
pip install pylint
./run_pylint.sh packaging/osx/lbry-osx-app/lbrygui/
fi
python setup.py install python setup.py install
echo "Building URI Handler" echo "Building URI Handler"
cd "${DEST}" cd "${DEST}"
if [ ! -d "py2app" ]; then
hg clone https://bitbucket.org/ronaldoussoren/py2app
cd py2app
hg checkout py2app-0.10
# this commit fixes a bug that should have been fixed as part of 0.10
hg graft 149c25c413420120d3f383a9e854a17bc10d96fd
pip install .
cd ..
rm -rf py2app
fi
rm -rf build dist rm -rf build dist
python setup_uri_handler.py py2app python setup_uri_handler.py py2app
@ -76,7 +90,10 @@ codesign -s "${LBRY_DEVELOPER_ID}" -f "${DEST}/dist/LBRYURIHandler.app/Contents/
codesign --deep -s "${LBRY_DEVELOPER_ID}" -f "${DEST}/dist/LBRYURIHandler.app/Contents/MacOS/LBRYURIHandler" codesign --deep -s "${LBRY_DEVELOPER_ID}" -f "${DEST}/dist/LBRYURIHandler.app/Contents/MacOS/LBRYURIHandler"
codesign -vvvv "${DEST}/dist/LBRYURIHandler.app" codesign -vvvv "${DEST}/dist/LBRYURIHandler.app"
python setup_app.py py2app # py2app will skip _cffi_backend without explicitly including it
# and without this, we will get SSL handshake errors when connecting
# to bittrex
python setup_app.py py2app -i _cffi_backend
echo "Removing i386 libraries" echo "Removing i386 libraries"
@ -104,5 +121,8 @@ codesign -vvvv "${DEST}/dist/LBRY.app"
rm -rf $tmp rm -rf $tmp
mv dist/LBRY.app LBRY.app mv dist/LBRY.app LBRY.app
rm -rf dist "${NAME}.${VERSION}.dmg"
dmgbuild -s dmg_settings.py "LBRY" "${NAME}.${VERSION}.dmg" if [ -z ${SKIP_SMG+x} ]; then
rm -rf dist "${NAME}.${VERSION}.dmg"
dmgbuild -s dmg_settings.py "LBRY" "${NAME}.${VERSION}.dmg"
fi

View file

@ -31,4 +31,3 @@ base58==0.2.2
googlefinance==0.7 googlefinance==0.7
pyyaml==3.12 pyyaml==3.12
service_identity==16.0.0 service_identity==16.0.0
ndg-httpsclient==0.4.2