From ae80fb4f971c0c42277127209be5ef0eba791eae Mon Sep 17 00:00:00 2001 From: Johann Bauer Date: Sat, 31 Mar 2018 18:22:23 +0200 Subject: [PATCH] Follow-up 6afe71fe --- contrib/build-osx/make_osx | 6 +++--- contrib/build-wine/build-electrum-git.sh | 4 ++-- contrib/build-wine/prepare-wine.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/build-osx/make_osx b/contrib/build-osx/make_osx index 5810a6ac0..60b160afa 100755 --- a/contrib/build-osx/make_osx +++ b/contrib/build-osx/make_osx @@ -56,12 +56,12 @@ tar xz --directory $BUILDDIR cp $BUILDDIR/libusb/1.0.22/lib/libusb-1.0.dylib contrib/build-osx info "Installing requirements..." -python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements.txt --user && \ -python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \ +python3 -m pip install -Ir ./contrib/deterministic-build/requirements.txt --user && \ +python3 -m pip install -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \ fail "Could not install requirements" info "Installing hardware wallet requirements..." -python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \ +python3 -m pip install -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \ fail "Could not install hardware wallet requirements" info "Building $PACKAGE..." diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 1f974dfc8..c3b92d62c 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -56,9 +56,9 @@ cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrum/lib/ cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum/gui/qt/ # Install frozen dependencies -$PYTHON -m pip install --require-hashes -r ../../deterministic-build/requirements.txt +$PYTHON -m pip install -r ../../deterministic-build/requirements.txt -$PYTHON -m pip install --require-hashes -r ../../deterministic-build/requirements-hw.txt +$PYTHON -m pip install -r ../../deterministic-build/requirements-hw.txt pushd $WINEPREFIX/drive_c/electrum $PYTHON setup.py install diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index ea63b6913..89dbca440 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -112,7 +112,7 @@ $PYTHON -m pip install pywin32-ctypes==0.1.2 # install PySocks $PYTHON -m pip install win_inet_pton==1.0.1 -$PYTHON -m pip install --require-hashes -r $here/../deterministic-build/requirements-binaries.txt +$PYTHON -m pip install $here/../deterministic-build/requirements-binaries.txt # Install PyInstaller $PYTHON -m pip install https://github.com/ecdsa/pyinstaller/archive/fix_2952.zip