..

LewisResearchGroup · Apr 19, 2023 · f94e6d9 · f94e6d9
1 parent dee7cb1
commit f94e6d9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/InnoSetup/InnoSetupScript.iss b/InnoSetup/InnoSetupScript.iss
@@ -37,8 +37,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\Users\soere\workspace\ms-mint-app\specfiles\dist\Mint\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\soere\workspace\ms-mint-app\specfiles\dist\Mint\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\soere\workspace\ms-mint-app\pyinstaller\dist\Mint\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\soere\workspace\ms-mint-app\pyinstaller\dist\Mint\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ lint:
 	flake8
 
 pyinstaller:
-	cd specfiles && pyinstaller --onedir --noconfirm Mint__onedir__.spec --additional-hooks-dir=hooks
+	cd specfiles && pyinstaller --noconfirm Mint.spec ../scripts/Mint.py
 
 docs:
 	mkdocs build && mkdocs gh-deploy

diff --git a/ms_mint_app/ms_files.py b/ms_mint_app/ms_files.py
@@ -233,6 +233,7 @@ def ms_delete(n_clicks, rows, wdir):
         id='ms-uploader',
     )
     def upload_completed(status):
+        logging.warning(f'Upload status: {status} ({type(status)})')
         return [str(fn) for fn in status.uploaded_files]
 
     @app.callback(

diff --git a/pyinstaller/Mint.spec b/pyinstaller/Mint.spec
@@ -3,25 +3,18 @@ import os
 from PyInstaller.utils.hooks import collect_submodules
 
 src_dir = os.path.abspath(os.path.join(SPECPATH, os.pardir))
-hooks_dir = os.path.join(src_dir, 'specfiles', 'hooks')
+hooks_dir = os.path.join(src_dir, 'pyinstaller', 'hooks')
 script = os.path.join(src_dir, 'scripts', 'Mint.py')
 
 
-hiddenimports_sklearn = collect_submodules('sklearn')
-hiddenimports_bs4 = collect_submodules('bs4')
-hiddenimports_scipy = collect_submodules('scipy')
-hiddenimports_pyarrow = collect_submodules('pyarrow')
-hiddenimports_ms_mint_app = collect_submodules('ms_mint_app')
-hiddenimports_packaging = collect_submodules('packaging')
-
-
 all_hidden_imports = (
     collect_submodules('sklearn')
     + collect_submodules('bs4')
     + collect_submodules('scipy')
     + collect_submodules('pyarrow')
     + collect_submodules('ms_mint_app')
     + collect_submodules('packaging')
+    + collect_submodules('brotli')
 )
 
 

diff --git a/pyinstaller/hooks/hook-pymzml.py b/pyinstaller/hooks/hook-pymzml.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import collect_data_files
 
 datas = collect_data_files("pymzml")
+hiddenimports = ["pymzml.obo"]
diff --git a/requirements.txt b/requirements.txt
@@ -16,4 +16,5 @@ Flask-Caching==1.10.1
 beautifulsoup4
 pandas>=1.4,<1.5
 packaging==21.3.0
-beautifulsoup4
+beautifulsoup4
+brotlipy