Skip to content

Commit

Permalink
requirements: rename some files
Browse files Browse the repository at this point in the history
  • Loading branch information
SomberNight committed Nov 14, 2020
1 parent c872c31 commit a4e342a
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion contrib/build-linux/appimage/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ info "preparing electrum-locale."

info "Installing build dependencies."
mkdir -p "$CACHEDIR/pip_cache"
"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-appimage-build.txt"
"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-build-appimage.txt"

info "installing electrum and its dependencies."
"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements.txt"
Expand Down
4 changes: 2 additions & 2 deletions contrib/build-linux/sdist/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ DISTDIR="$PROJECT_ROOT/dist"
python3 --version || fail "python interpreter not found"

# upgrade to modern pip so that it knows the flags we need.
# we will then install a pinned version of pip as part of requirements-sdist-build
# we will then install a pinned version of pip as part of requirements-build-sdist
python3 -m pip install --upgrade pip

info "Installing pinned requirements."
python3 -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-sdist-build.txt
python3 -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-build-sdist.txt


"$CONTRIB"/make_packages || fail "make_packages failed"
Expand Down
2 changes: 1 addition & 1 deletion contrib/build-wine/prepare-wine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ for msifile in core dev exe lib pip tools; do
done

info "Installing build dependencies."
$PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-wine-build.txt
$PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-build-wine.txt

info "Installing dependencies specific to binaries."
$PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-binaries.txt
Expand Down
2 changes: 1 addition & 1 deletion contrib/freeze_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ which virtualenv > /dev/null 2>&1 || { echo "Please install virtualenv" && exit

${SYSTEM_PYTHON} -m hashin -h > /dev/null 2>&1 || { ${SYSTEM_PYTHON} -m pip install hashin; }

for i in '' '-hw' '-binaries' '-wine-build' '-mac-build' '-sdist-build' '-appimage-build'; do
for i in '' '-hw' '-binaries' '-build-wine' '-build-mac' '-build-sdist' '-build-appimage'; do
rm -rf "$venv_dir"
virtualenv -p ${SYSTEM_PYTHON} $venv_dir

Expand Down
2 changes: 1 addition & 1 deletion contrib/osx/make_osx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pyenv global $PYTHON_VERSION || \
fail "Unable to use Python $PYTHON_VERSION"

info "Installing build dependencies"
python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-mac-build.txt --user \
python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-build-mac.txt --user \
|| fail "Could not install build dependencies"

info "Using these versions for building $PACKAGE:"
Expand Down

0 comments on commit a4e342a

Please sign in to comment.