fixed obabel package

lmdu · Jan 30, 2022 · a53f5f6 · a53f5f6
1 parent 698e058
commit a53f5f6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/hooks/hook-openbabel.py b/hooks/hook-openbabel.py
@@ -1,2 +1,2 @@
-from PyInstaller.utils.hooks import collect_data_files
-datas = collect_data_files('openbabel')
+from PyInstaller.utils.hooks import collect_all
+datas, binaries, _ = collect_all('openbabel')
diff --git a/hooks/pyi_rth_openbabel.py b/hooks/pyi_rth_openbabel.py
diff --git a/package/build_win.spec b/package/build_win.spec
@@ -11,7 +11,7 @@ a = Analysis(['../src/main.py'],
              hiddenimports=[],
              hookspath=['hooks'],
              hooksconfig={},
-             runtime_hooks=['hooks/pyi_rth_openbabel.py'],
+             runtime_hooks=[],
              excludes=['FixTk', 'tcl', 'tk', '_tkinter', 'tkinter', 'Tkinter',
                  'sqlite3', 'pkg_resources', 'multiprocessing', 'PySide6.QtQml',
                  'PySide6.QtNetwork', 'PySide6.QtQuick'
@@ -28,11 +28,11 @@ exe = EXE(pyz,
           [],
           exclude_binaries=True,
           name='Dockey',
-          debug=True,
+          debug=False,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
-          console=True,
+          console=False,
           disable_windowed_traceback=False,
           target_arch=None,
           codesign_identity=None,

diff --git a/src/config.py b/src/config.py
@@ -9,7 +9,7 @@
 
 DOCKEY_VERSION = "0.2.0"
 
-DOCKEY_BUILD = "220126"
+DOCKEY_BUILD = "220130"
 
 DOCKEY_ABOUT = """
 <p>Dockey - Molecular Docking and Virtual Screening</p>

diff --git a/src/utils.py b/src/utils.py
@@ -213,10 +213,6 @@ def get_molecule_information(mol_file):
 	obc.ReadFile(mol, mol_file)
 	des = openbabel.OBDescriptor.FindType('logP')
 
-	print(os.environ['BABEL_LIBDIR'])
-	print(os.environ['BABEL_DATADIR'])
-	print(os.environ['BABEL'])
-
 	return AttrDict(
 		name = mol_name,
 		atoms = mol.NumAtoms(),