mac build: install pinned pip and setuptools earlier
also add --no-use-pep517 option for pyinstaller (see 4b560250a6)
This commit is contained in:
@@ -48,8 +48,14 @@ pyenv global $PYTHON_VERSION || \
|
|||||||
fail "Unable to use Python $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"
|
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:"
|
info "Using these versions for building $PACKAGE:"
|
||||||
sw_vers
|
sw_vers
|
||||||
@@ -98,8 +104,7 @@ DoCodeSignMaybe "CalinsQRReader.app" "${d}/build/Release/CalinsQRReader.app" "$A
|
|||||||
|
|
||||||
|
|
||||||
info "Installing requirements..."
|
info "Installing requirements..."
|
||||||
python3 -m pip install -Ir ./contrib/deterministic-build/requirements.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"
|
fail "Could not install requirements"
|
||||||
|
|
||||||
info "Installing hardware wallet requirements..."
|
info "Installing hardware wallet requirements..."
|
||||||
|
|||||||
Reference in New Issue
Block a user