diff --git a/build.sh b/build.sh index b8c695d2c..f00116542 100755 --- a/build.sh +++ b/build.sh @@ -39,18 +39,9 @@ pushd $ROOT/app npm install popd -pushd "$ROOT/lbry" -pip install -r requirements.txt -# need to install our version of lbryum, not -# what is currently on master -pushd "$ROOT/lbryum" -pip install . -popd -pip install . -popd - ( cd "$ROOT/lbrynet" + pip install -r posix.txt pyinstaller -y lbry.onefile.spec ) diff --git a/lbrynet/build.ps1 b/lbrynet/build.ps1 index b097f7211..7732c823b 100644 --- a/lbrynet/build.ps1 +++ b/lbrynet/build.ps1 @@ -16,9 +16,7 @@ python.exe setupmingw32.py install cd ..\..\ Remove-Item -Recurse -Force temp -pip.exe install -r windows-requirements.txt -pip.exe install ..\lbryum -pip.exe install ..\lbry pip.exe install pyinstaller +pip.exe install -r windows.txt pyinstaller -y lbry.onefile.spec \ No newline at end of file diff --git a/lbrynet/posix.txt b/lbrynet/posix.txt new file mode 100644 index 000000000..abd23e747 --- /dev/null +++ b/lbrynet/posix.txt @@ -0,0 +1,3 @@ +-r requirements.txt +miniupnpc==1.9 +gmpy==1.17 diff --git a/lbrynet/windows-requirements.txt b/lbrynet/requirements.txt similarity index 65% rename from lbrynet/windows-requirements.txt rename to lbrynet/requirements.txt index 3d7024332..6bfdc7169 100644 --- a/lbrynet/windows-requirements.txt +++ b/lbrynet/requirements.txt @@ -1,30 +1,30 @@ -pypiwin32==219 -six==1.10.0 -requests[security]==2.13.0 -zope.interface==4.3.3 Twisted==16.6.0 appdirs==1.4.0 argparse==1.2.1 +base58==0.2.2 colorama==0.3.7 dnspython==1.12.0 ecdsa==0.13 envparse==0.2.0 +googlefinance==0.7 jsonrpc==1.2 jsonrpclib==0.1.7 -loggly-python-handler==1.0.0 +jsonschema==2.5.1 +# for electron, we install lbryum, lbrynet using submodules +../lbryum +../lbry pbkdf2==1.3 protobuf==3.0.0 pycrypto==2.6.1 -python-bitcoinrpc==0.1 pyyaml==3.12 qrcode==5.2.2 +requests==2.9.1 requests_futures==0.9.7 seccure==0.3.1.3 +service_identity==16.0.0 simplejson==3.8.2 +six>=1.9.0 slowaes==0.1a1 txJSON-RPC==0.5 wsgiref==0.1.2 -base58==0.2.2 -googlefinance==0.7 -jsonschema==2.5.1 -https://github.com/lbryio/lbry/raw/master/packaging/windows/libs/gmpy-1.17-cp27-none-win32.whl +zope.interface==4.3.3 diff --git a/lbrynet/windows.txt b/lbrynet/windows.txt new file mode 100644 index 000000000..f911e4f3a --- /dev/null +++ b/lbrynet/windows.txt @@ -0,0 +1,3 @@ +-r requirements.txt +# on windows miniupnpc needs to be installed manually +https://github.com/lbryio/lbry/raw/master/packaging/windows/libs/gmpy-1.17-cp27-none-win32.whl