Pyinstaller fix (#46)

andreasgriffin · Jan 1, 2025 · a6709b5 · a6709b5
1 parent 2ae9f01
commit a6709b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/bitcoin_safe/dynamic_lib_load.py b/bitcoin_safe/dynamic_lib_load.py
@@ -125,8 +125,9 @@ def setup_libsecp256k1() -> None:
         msg = translate(
             "dynamic_lib_load", "libsecp256k1 could not be found. Please install libsecp256k1 in your OS."
         )
-        logger.info(msg)
-        show_warning_before_failiure(msg)
+        logger.warning(msg)
+        # cannot show a gui message here, because otherwise
+        # pyinstaller (which goes through all module inits)  halts
 
 
 def ensure_pyzbar_works() -> None:

diff --git a/tools/build-mac/make_osx.sh b/tools/build-mac/make_osx.sh
@@ -100,8 +100,7 @@ brew install autoconf automake libtool gettext coreutils pkgconfig
 
 info "Building PyInstaller."
 PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
-PYINSTALLER_COMMIT="5d7a0449ecea400eccbbb30d5fcef27d72f8f75d"
-# ^ tag "v6.6.0"
+PYINSTALLER_COMMIT="1318b8bc26d348147c4e99c0a7b60052a27eb1cc" # ^ tag "v6.11.1"
 (
     if [ -f "$CACHEDIR/pyinstaller/PyInstaller/bootloader/Darwin-64bit/runw" ]; then
         info "pyinstaller already built, skipping"

diff --git a/tools/build-wine/prepare-wine.sh b/tools/build-wine/prepare-wine.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
-PYINSTALLER_COMMIT="5d7a0449ecea400eccbbb30d5fcef27d72f8f75d"
-# ^ tag "v6.6.0"
+PYINSTALLER_COMMIT="1318b8bc26d348147c4e99c0a7b60052a27eb1cc" # ^ tag "v6.11.1"
 
 PYTHON_VERSION=3.10.4
 WINE_PIP_CACHE_DIR=$(win_path "$PIP_CACHE_DIR")

diff --git a/tools/release.py b/tools/release.py
@@ -274,13 +274,6 @@ def main() -> None:
     from bitcoin_safe import __version__
 
     git_tag: Optional[str] = get_git_tag()
-    if git_tag == __version__ and (
-        get_input_with_default(
-            f"The tag {git_tag} exists already. Do you want to continue? (y/n): ", "n"
-        ).lower()
-        != "y"
-    ):
-        return
 
     if get_input_with_default(f"Is this version {__version__} correct? (y/n): ", "y").lower() != "y":
         return