commit b0230f6a4bd7498aa0dd1d48ec61326d35a40386 parent 0b6ce657b152448ed7640d824385791d13938a22 Author: SomberNight <somber.night@protonmail.com> Date: Thu, 11 Jun 2020 03:43:40 +0200 build: fix win/appimage binaries following jsonrpc dep-removal follow-up #6220 Diffstat:
| M | contrib/build-linux/appimage/build.sh | | | 6 | ++---- |
| M | contrib/build-wine/build-electrum-git.sh | | | 4 | ---- |
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh @@ -206,13 +206,11 @@ rm -rf "$PYDIR"/site-packages/PyQt5/Qt.so # these are deleted as they were not deterministic; and are not needed anyway find "$APPDIR" -path '*/__pycache__*' -delete -# note that jsonschema-*.dist-info is needed by that package as it uses 'pkg_resources.get_distribution' -# also, see https://gitlab.com/python-devs/importlib_metadata/issues/71 -for f in "$PYDIR"/site-packages/jsonschema-*.dist-info; do mv "$f" "$(echo "$f" | sed s/\.dist-info/\.dist-info2/)"; done +# note that *.dist-info is needed by certain packages. +# e.g. see https://gitlab.com/python-devs/importlib_metadata/issues/71 for f in "$PYDIR"/site-packages/importlib_metadata-*.dist-info; do mv "$f" "$(echo "$f" | sed s/\.dist-info/\.dist-info2/)"; done rm -rf "$PYDIR"/site-packages/*.dist-info/ rm -rf "$PYDIR"/site-packages/*.egg-info/ -for f in "$PYDIR"/site-packages/jsonschema-*.dist-info2; do mv "$f" "$(echo "$f" | sed s/\.dist-info2/\.dist-info/)"; done for f in "$PYDIR"/site-packages/importlib_metadata-*.dist-info2; do mv "$f" "$(echo "$f" | sed s/\.dist-info2/\.dist-info/)"; done diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh @@ -53,10 +53,6 @@ $PYTHON -m pip install --no-dependencies --no-warn-script-location . popd -# these are deleted as they were not deterministic; and are not needed anyway -rm "$WINEPREFIX"/drive_c/python3/Lib/site-packages/jsonschema-*.dist-info/RECORD - - rm -rf dist/ # build standalone and portable versions