Browse Source

win/mac build: bump pyinstaller (5.11.0->5.13.2)

- needed for bumping python version, as 3.11+ is borked without https://github.com/pyinstaller/pyinstaller/issues/7692
- plugin.py: adapt to pyinstaller 5.12+
    loader was renamed in b9111db8a8
master
SomberNight 2 years ago
parent
commit
85af0b8030
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 4
      contrib/build-wine/prepare-wine.sh
  2. 4
      contrib/osx/make_osx.sh
  3. 2
      electrum/plugin.py

4
contrib/build-wine/prepare-wine.sh

@ -1,8 +1,8 @@
#!/bin/bash
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
PYINSTALLER_COMMIT="413cce49ff28d87fad4472f4953489226ec90c84"
# ^ tag "v5.11.0"
PYINSTALLER_COMMIT="d1b6b520a017578a19e1cb9514752a4517755ee0"
# ^ tag "v5.13.2"
PYTHON_VERSION=3.11.9

4
contrib/osx/make_osx.sh

@ -88,8 +88,8 @@ brew install autoconf automake libtool gettext coreutils pkgconfig
info "Building PyInstaller."
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
PYINSTALLER_COMMIT="413cce49ff28d87fad4472f4953489226ec90c84"
# ^ tag "v5.11.0"
PYINSTALLER_COMMIT="d1b6b520a017578a19e1cb9514752a4517755ee0"
# ^ tag "v5.13.2"
(
if [ -f "$CACHEDIR/pyinstaller/PyInstaller/bootloader/Darwin-64bit/runw" ]; then
info "pyinstaller already built, skipping"

2
electrum/plugin.py

@ -97,7 +97,7 @@ class Plugins(DaemonThread):
# FIXME pyinstaller binaries are packaging each built-in plugin twice:
# once as data and once as code. To honor the "no duplicates" rule below,
# we exclude the ones packaged as *code*, here:
if loader.__class__.__qualname__ == "FrozenImporter":
if loader.__class__.__qualname__ == "PyiFrozenImporter":
continue
full_name = f'electrum.plugins.{name}'
spec = importlib.util.find_spec(full_name)

Loading…
Cancel
Save