twine build: small clean-up in prepare-wine.sh - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2de7fd546689720d68c2d24e7f136b8bd6c690d5
DIR parent 001b815c18fa5557758c9496f8523453d4423c25
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Mon, 4 Feb 2019 20:05:40 +0100
wine build: small clean-up in prepare-wine.sh
Diffstat:
M contrib/build-wine/prepare-wine.sh | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
---
DIR diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
t@@ -55,11 +55,9 @@ for msifile in core dev exe lib pip tools; do
wine msiexec /i "${msifile}.msi" /qb TARGETDIR=$PYHOME
done
-# upgrade pip
-$PYTHON -m pip install pip --upgrade
-
-
-$PYTHON -m pip install -r $here/../deterministic-build/requirements-binaries.txt
+# Install dependencies specific to binaries
+# note that this also installs pinned versions of both pip and setuptools
+$PYTHON -m pip install -r "$here"/../deterministic-build/requirements-binaries.txt
# Install PyInstaller
$PYTHON -m pip install pyinstaller==3.4 --no-use-pep517
t@@ -69,9 +67,6 @@ download_if_not_exist $ZBAR_FILENAME "$ZBAR_URL"
verify_hash $ZBAR_FILENAME "$ZBAR_SHA256"
wine "$PWD/$ZBAR_FILENAME" /S
-# Upgrade setuptools (so Electrum can be installed later)
-$PYTHON -m pip install setuptools --upgrade
-
# Install NSIS installer
download_if_not_exist $NSIS_FILENAME "$NSIS_URL"
verify_hash $NSIS_FILENAME "$NSIS_SHA256"