commit aac770404f9a1f91299ca76c9865465aac05116b
parent d9b42700351dd73d1fb92b4a92057240305e747a
Author: SomberNight <somber.night@protonmail.com>
Date: Thu, 14 May 2020 18:25:39 +0200
mac build: pin hashes of more build dependencies
namely pyinstaller
Diffstat:
4 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/contrib/deterministic-build/requirements-mac-build.txt b/contrib/deterministic-build/requirements-mac-build.txt
@@ -0,0 +1,14 @@
+altgraph==0.17 \
+ --hash=sha256:1f05a47122542f97028caf78775a095fbe6a2699b5089de8477eb583167d69aa \
+ --hash=sha256:c623e5f3408ca61d4016f23a681b9adb100802ca3e3da5e718915a9e4052cebe
+pip==20.0.2 \
+ --hash=sha256:4ae14a42d8adba3205ebeb38aa68cfc0b6c346e1ae2e699a0b3bad4da19cef5c \
+ --hash=sha256:7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f
+PyInstaller==3.6 \
+ --hash=sha256:3730fa80d088f8bb7084d32480eb87cbb4ddb64123363763cf8f2a1378c1c4b7
+setuptools==46.1.3 \
+ --hash=sha256:4fe404eec2738c20ab5841fa2d791902d2a645f32318a7850ef26f8d7215a8ee \
+ --hash=sha256:795e0475ba6cd7fa082b1ee6e90d552209995627a2a227a47c6ea93282f4bfb1
+wheel==0.34.2 \
+ --hash=sha256:8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96 \
+ --hash=sha256:df277cb51e61359aba502208d680f90c0493adec6f0e848af94948778aed386e+
\ No newline at end of file
diff --git a/contrib/freeze_packages.sh b/contrib/freeze_packages.sh
@@ -10,7 +10,7 @@ which virtualenv > /dev/null 2>&1 || { echo "Please install virtualenv" && exit
python3 -m hashin -h > /dev/null 2>&1 || { python3 -m pip install hashin; }
other_python=$(which python3)
-for i in '' '-hw' '-binaries' '-wine-build'; do
+for i in '' '-hw' '-binaries' '-wine-build' '-mac-build'; do
rm -rf "$venv_dir"
virtualenv -p $(which python3) $venv_dir
diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx
@@ -73,15 +73,9 @@ 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 --no-dependencies -Ir ./contrib/deterministic-build/requirements-binaries.txt --user \
- || fail "Could not install pyinstaller"
-
-
-info "Installing pyinstaller"
-python3 -m pip install -I --user pyinstaller==3.6 || fail "Could not install pyinstaller"
+info "Installing build dependencies"
+python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-mac-build.txt --user \
+ || fail "Could not install build dependencies"
info "Using these versions for building $PACKAGE:"
sw_vers
@@ -134,12 +128,16 @@ DoCodeSignMaybe "CalinsQRReader.app" "${d}/build/Release/CalinsQRReader.app"
info "Installing requirements..."
-python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements.txt --user || \
-fail "Could not install requirements"
+python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements.txt --user \
+ || fail "Could not install requirements"
info "Installing hardware wallet requirements..."
-python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
-fail "Could not install hardware wallet requirements"
+python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-hw.txt --user \
+ || fail "Could not install hardware wallet requirements"
+
+info "Installing dependencies specific to binaries..."
+python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-binaries.txt --user \
+ || fail "Could not install dependencies specific to binaries"
info "Building $PACKAGE..."
python3 -m pip install --no-dependencies --user . > /dev/null || fail "Could not build $PACKAGE"
diff --git a/contrib/requirements/requirements-mac-build.txt b/contrib/requirements/requirements-mac-build.txt
@@ -0,0 +1,3 @@
+pip
+setuptools
+pyinstaller>=3.6
