commit 89bb49e117d47187ecc2aeb4da17405d12db7015 parent 2c71b9da0c3698332aa0758fe1d0e49c3ebebf9e Author: SomberNight <somber.night@protonmail.com> Date: Thu, 7 Feb 2019 20:19:07 +0100 mac build: install pinned pip and setuptools earlier also add --no-use-pep517 option for pyinstaller (see 4b560250a64fb18b1bf99a5bc619033dcdc47929) Diffstat:
| M | contrib/osx/make_osx | | | 11 | ++++++++--- |
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx @@ -48,8 +48,14 @@ pyenv global $PYTHON_VERSION || \ fail "Unable to use Python $PYTHON_VERSION" +info "install dependencies specific to binaries" +# note that this also installs pinned versions of both pip and setuptools +python3 -m pip install -Ir ./contrib/deterministic-build/requirements-binaries.txt --user \ + || fail "Could not install pyinstaller" + + info "Installing pyinstaller" -python3 -m pip install -I --user pyinstaller==3.4 || fail "Could not install pyinstaller" +python3 -m pip install -I --user pyinstaller==3.4 --no-use-pep517 || fail "Could not install pyinstaller" info "Using these versions for building $PACKAGE:" sw_vers @@ -98,8 +104,7 @@ DoCodeSignMaybe "CalinsQRReader.app" "${d}/build/Release/CalinsQRReader.app" "$A info "Installing requirements..." -python3 -m pip install -Ir ./contrib/deterministic-build/requirements.txt --user && \ -python3 -m pip install -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \ +python3 -m pip install -Ir ./contrib/deterministic-build/requirements.txt --user || \ fail "Could not install requirements" info "Installing hardware wallet requirements..."