From 4c27cbb9b793c9f79804d2b9d956ab8a57b55355 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Thu, 6 Apr 2017 18:16:24 -0400 Subject: [PATCH] fix outdated daemon dependencies --- build/build.sh | 7 +++++++ daemon/build.ps1 | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/build/build.sh b/build/build.sh index 6887e6b73..89ce676d5 100755 --- a/build/build.sh +++ b/build/build.sh @@ -64,6 +64,13 @@ npm install ( cd "$ROOT/daemon" + + # copy requirements from lbry, but remove lbryum (we'll add it back in below) + grep -v lbryum "$ROOT/lbry/requirements.txt" > requirements.txt + # for electron, we install lbryum and lbry using submodules + echo "../lbryum" >> requirements.txt + echo "../lbry" >> requirements.txt + pip install -r linux_macos.txt pyinstaller -y daemon.onefile.spec pyinstaller -y cli.onefile.spec diff --git a/daemon/build.ps1 b/daemon/build.ps1 index 9e4148f86..c7e396570 100644 --- a/daemon/build.ps1 +++ b/daemon/build.ps1 @@ -16,6 +16,12 @@ 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 +# for electron, we install lbryum and lbry using submodules +Add-Content requirements.txt "`n../lbryum" +Add-Content requirements.txt "`n../lbry" + pip.exe install pyinstaller pip.exe install -r windows.txt