trequirements: rename some files - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit a4e342ac588ba334c0e1fbb3e7065c2edb411d4b
DIR parent c872c3194f4fa4638bd6d3f50b21b449111b8c50
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Fri, 13 Nov 2020 19:24:17 +0100
requirements: rename some files
Diffstat:
M contrib/build-linux/appimage/build… | 2 +-
M contrib/build-linux/sdist/build.sh | 4 ++--
M contrib/build-wine/prepare-wine.sh | 2 +-
R contrib/deterministic-build/requir… | 0
R contrib/deterministic-build/requir… | 0
R contrib/deterministic-build/requir… | 0
R contrib/deterministic-build/requir… | 0
M contrib/freeze_packages.sh | 2 +-
M contrib/osx/make_osx | 2 +-
R contrib/requirements/requirements-… | 0
R contrib/requirements/requirements-… | 0
R contrib/requirements/requirements-… | 0
R contrib/requirements/requirements-… | 0
13 files changed, 6 insertions(+), 6 deletions(-)
---
DIR diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh
t@@ -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"
DIR diff --git a/contrib/build-linux/sdist/build.sh b/contrib/build-linux/sdist/build.sh
t@@ -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"
DIR diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
t@@ -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
DIR diff --git a/contrib/deterministic-build/requirements-appimage-build.txt b/contrib/deterministic-build/requirements-build-appimage.txt
DIR diff --git a/contrib/deterministic-build/requirements-mac-build.txt b/contrib/deterministic-build/requirements-build-mac.txt
DIR diff --git a/contrib/deterministic-build/requirements-sdist-build.txt b/contrib/deterministic-build/requirements-build-sdist.txt
DIR diff --git a/contrib/deterministic-build/requirements-wine-build.txt b/contrib/deterministic-build/requirements-build-wine.txt
DIR diff --git a/contrib/freeze_packages.sh b/contrib/freeze_packages.sh
t@@ -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
DIR diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx
t@@ -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:"
DIR diff --git a/contrib/requirements/requirements-appimage-build.txt b/contrib/requirements/requirements-build-appimage.txt
DIR diff --git a/contrib/requirements/requirements-mac-build.txt b/contrib/requirements/requirements-build-mac.txt
DIR diff --git a/contrib/requirements/requirements-sdist-build.txt b/contrib/requirements/requirements-build-sdist.txt
DIR diff --git a/contrib/requirements/requirements-wine-build.txt b/contrib/requirements/requirements-build-wine.txt