Skip to content

Commit

Permalink
OSX Build: Fix pipenv build
Browse files Browse the repository at this point in the history
  • Loading branch information
lclc authored and toxeus committed Oct 27, 2019
1 parent 863b577 commit 273e0c8
Showing 1 changed file with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions contrib/osx/make_osx
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,15 @@ else
warn "Code signing DISABLED. Specify a valid macOS Developer identity installed on the system as the first argument to this script to enable signing."
fi

info "Installing Python $PYTHON_VERSION"
export PATH="~/.pyenv/bin:~/.pyenv/shims:~/Library/Python/3.6/bin:$PATH"
if [ -d "~/.pyenv" ]; then
pyenv update
else
curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1
fi
PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \
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 \
python3 -m pip install -Ir ./contrib/deterministic-build/requirements-binaries.txt \
|| fail "Could not install pyinstaller"


info "Installing pyinstaller"
python3 -m pip install -I --user pyinstaller==3.4 --no-use-pep517 || fail "Could not install pyinstaller"
python3 -m pip install -I pyinstaller==3.4 --no-use-pep517 || fail "Could not install pyinstaller"

info "Using these versions for building $PACKAGE:"
sw_vers
Expand Down Expand Up @@ -119,15 +108,15 @@ 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.txt || \
fail "Could not install requirements"

info "Installing hardware wallet requirements..."
python3 -m pip install -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
python3 -m pip install -Ir ./contrib/deterministic-build/requirements-hw.txt || \
fail "Could not install hardware wallet requirements"

info "Building $PACKAGE..."
python3 -m pip install --user . > /dev/null || fail "Could not build $PACKAGE"
python3 -m pip install . > /dev/null || fail "Could not build $PACKAGE"

info "Faking timestamps..."
for d in ~/Library/Python/ ~/.pyenv .; do
Expand Down

0 comments on commit 273e0c8

Please sign in to comment.