diff --git a/daemon/build.ps1 b/daemon/build.ps1 index c7e396570..f367e3308 100644 --- a/daemon/build.ps1 +++ b/daemon/build.ps1 @@ -5,7 +5,7 @@ gcc --version mingw32-make --version mkdir temp -Invoke-WebRequest "https://pypi.python.org/packages/55/90/e987e28ed29b571f315afea7d317b6bf4a551e37386b344190cffec60e72/miniupnpc-1.9.tar.gz" -OutFile "temp\miniupnpc-1.9.tar.gz" +mv miniupnpc-1.9.tar.gz temp\miniupnpc-1.9.tar.gz cd temp tar zxf miniupnpc-1.9.tar.gz cd miniupnpc-1.9 @@ -16,11 +16,13 @@ python.exe setupmingw32.py install cd ..\..\ Remove-Item -Recurse -Force temp -# copy requirements from lbry, but remove lbryum (we'll add it back in below) -Get-Content ..\lbry\requirements.txt | Where-Object {$_ -notmatch 'lbryum'} | Set-Content requirements.txt +# copy requirements from lbry, but remove lbryum (we'll add it back in below) and gmpy and miniupnpc (installed manually) +$Skip = @("*lbryum*","*gmpy*","*miniupnpc*") +Get-Content ..\lbry\requirements.txt | Where-Object {$_ -notlike $Skip} | Set-Content requirements.txt # for electron, we install lbryum and lbry using submodules Add-Content requirements.txt "`n../lbryum" Add-Content requirements.txt "`n../lbry" +Get-Content requirements.txt pip.exe install pyinstaller pip.exe install -r windows.txt diff --git a/daemon/linux_macos.txt b/daemon/linux_macos.txt index 2cb8de79e..5a32a8e62 100644 --- a/daemon/linux_macos.txt +++ b/daemon/linux_macos.txt @@ -1,4 +1,2 @@ -r requirements.txt -miniupnpc==1.9 -gmpy==1.17 PyInstaller==3.2.1 diff --git a/daemon/miniupnpc-1.9.tar.gz b/daemon/miniupnpc-1.9.tar.gz new file mode 100644 index 000000000..85deda499 Binary files /dev/null and b/daemon/miniupnpc-1.9.tar.gz differ diff --git a/daemon/requirements.txt b/daemon/requirements.txt deleted file mode 100644 index bef178815..000000000 --- a/daemon/requirements.txt +++ /dev/null @@ -1,29 +0,0 @@ -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 -jsonschema==2.5.1 -# for electron, we install lbryum, lbry using submodules -../lbryum -../lbry -pbkdf2==1.3 -protobuf==3.0.0 -pycrypto==2.6.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 -six>=1.9.0 -slowaes==0.1a1 -txJSON-RPC==0.5 -wsgiref==0.1.2 -zope.interface==4.3.3 diff --git a/daemon/windows.txt b/daemon/windows.txt index f911e4f3a..0965e1f0f 100644 --- a/daemon/windows.txt +++ b/daemon/windows.txt @@ -1,3 +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 +# miniupnpc is installed manually +./gmpy-1.17-cp27-none-win32.whl