From 15ade508aae1ba9abef3645a9e85be8024f18986 Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Thu, 15 Dec 2016 15:41:17 -0600 Subject: [PATCH 1/3] add ndg-httpsclient as a requirement --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 912f157c3..bcb445682 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,3 +31,4 @@ base58==0.2.2 googlefinance==0.7 pyyaml==3.12 service_identity==16.0.0 +ndg-httpsclient==0.4.2 From c825d88dbf0a6d2eae127544369c915d104d5494 Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Thu, 15 Dec 2016 16:23:50 -0600 Subject: [PATCH 2/3] OSX is having https issues, hopefully this fixes it When I build locally, the resulting app doesn't have https issues. Looking over the build script output, I notice that its copying copying /usr/local/opt/openssl/lib/libssl.1.0.0.dylib -> /Users/jobevers/tmp/lbry/packaging/osx/lbry-osx-app/dist/LBRY.app/Contents/Frameworks such a line isn't present when travis builds. This version of libssl is installed by homebrew. Fingers crossed. --- packaging/travis/setup_osx.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/travis/setup_osx.sh b/packaging/travis/setup_osx.sh index 9a1448856..9fc187f70 100755 --- a/packaging/travis/setup_osx.sh +++ b/packaging/travis/setup_osx.sh @@ -6,4 +6,7 @@ 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 update brew install gmp +brew install openssl +brew link --force openssl From 4a8a8b8d33f89944e3182a90b22eb0d9400c4438 Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Fri, 16 Dec 2016 11:04:47 -0600 Subject: [PATCH 3/3] sync setup.py with requirements.txt --- setup.py | 52 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index 77e8f5542..154ff8e1f 100644 --- a/setup.py +++ b/setup.py @@ -28,28 +28,46 @@ maintainer = "Jack Robison" maintainer_email = "jack@lbry.io" keywords = "LBRY" + +# TODO: find a way to keep this in sync with requirements.txt requires = [ - 'pycrypto', - 'twisted', - 'miniupnpc', - 'yapsy', - 'seccure', - 'txJSON-RPC', - 'requests>=2.4.2', - 'unqlite==0.2.0', + 'Twisted==16.0.0', + 'Yapsy==1.11.223', + 'appdirs==1.4.0', + 'argparse==1.2.1', + 'colorama==0.3.7', + 'dnspython==1.12.0', + 'ecdsa==0.13', + 'envparse==0.2.0', + 'gmpy==1.17', + 'jsonrpc==1.2', + 'jsonrpclib==0.1.7', + 'jsonschema==2.5.1', 'lbryum', - 'jsonrpc', - 'simplejson', - 'jsonschema', - 'appdirs', + 'loggly-python-handler==1.0.0', + 'miniupnpc==1.9', + 'pbkdf2==1.3', + 'protobuf==3.0.0', + 'pycrypto==2.6.1', + 'qrcode==5.2.2', + 'requests==2.9.1', + 'requests_futures==0.9.7', + 'seccure==0.3.1.3', + 'simplejson==3.8.2', 'six==1.9.0', - 'base58', - 'googlefinance', - 'requests_futures', - 'PyYAML', - 'envparse' + 'slowaes==0.1a1', + 'txJSON-RPC==0.3.1', + 'unqlite==0.2.0', + 'wsgiref==0.1.2', + 'zope.interface==4.1.3', + 'base58==0.2.2', + 'googlefinance==0.7', + 'pyyaml==3.12', + 'service_identity==16.0.0', + 'ndg-httpsclient==0.4.2', ] + console_scripts = [ 'lbrynet-daemon = lbrynet.lbrynet_daemon.DaemonControl:start', 'stop-lbrynet-daemon = lbrynet.lbrynet_daemon.DaemonControl:stop',