From 9c9952e63cf2a7a80a59cd354083bceaf7a380a6 Mon Sep 17 00:00:00 2001 From: dbouget Date: Mon, 21 Aug 2023 14:52:14 +0200 Subject: [PATCH] Added scipy hook, DLL import issues on Windows --- .github/workflows/build_windows.yml | 1 - assets/hooks/hook-scipy.py | 6 ++++++ assets/main.spec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 assets/hooks/hook-scipy.py diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 5749199..4851806 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -46,7 +46,6 @@ jobs: pip install matplotlib==3.3.4 pip install -e git+https://github.com/dbouget/raidionics_rads_lib.git@update#egg=raidionicsrads pip install -r assets/requirements.txt - pip install scipy==1.9.3 - name: Build software run: | diff --git a/assets/hooks/hook-scipy.py b/assets/hooks/hook-scipy.py new file mode 100644 index 0000000..0905fe8 --- /dev/null +++ b/assets/hooks/hook-scipy.py @@ -0,0 +1,6 @@ +from PyInstaller.utils.hooks import collect_submodules +from PyInstaller.utils.hooks import collect_data_files + +hiddenimports = collect_submodules("scipy") + +datas = collect_data_files("scipy") diff --git a/assets/main.spec b/assets/main.spec index 6c0d852..8ba0874 100644 --- a/assets/main.spec +++ b/assets/main.spec @@ -19,7 +19,7 @@ print("PLATFORM:", sys.platform) # fix hidden imports hidden_imports = loadtxt(cwd + "/assets/requirements.txt", comments="#", delimiter=",", unpack=False, dtype=str) -hidden_imports = [x.split("=")[0] for x in hidden_imports] + ["ants", "sklearn", "scikit-learn", +hidden_imports = [x.split("=")[0] for x in hidden_imports] + ["ants", "sklearn", "scikit-learn", "scipy", "statsmodels", "gevent", "distutils", "PySide6", "gdown", "pydicom", "rt_utils", "raidionicsrads", "raidionicsseg"] hidden_imports = [x.lower() for x in hidden_imports]