Merge pull request #368 from BradyAJohnston/367-scipy-dependencies

relax requirement for scipy for import, only for biological assemblies

molecularnodes/__init__.py

@@ -16,7 +16,7 @@
     "author"      : "Brady Johnston",
     "description" : "Toolbox for molecular animations in Blender & Geometry Nodes.",
     "blender"     : (4, 0, 0),
-    "version"     : (4, 0, 2),
+    "version"     : (4, 0, 3),
     "location"    : "Scene Properties -> Molecular Nodes",
     "warning"     : "",
     "doc_url"     : "https://bradyajohnston.github.io/MolecularNodes/",

molecularnodes/io/local.py

@@ -1,6 +1,6 @@
 import bpy
 import warnings
-from .. import assembly
+from .. import assembly, pkg
 from .load import create_molecule
 from ..blender import (
     nodes
@@ -162,6 +162,10 @@ def panel(layout, scene):
     layout.prop(scene, "MN_import_style")
     grid = layout.grid_flow()
 
-    grid.prop(scene, 'MN_import_build_assembly')
+    row = grid.row().column()
+    if not pkg.is_current('scipy'):
+        row.enabled = False
+        row.label(text = 'For assemblies, install scipy in add-on preferences.')
+    row.prop(scene, 'MN_import_build_assembly')
     grid.prop(scene, 'MN_import_centre', icon_value=0)
     grid.prop(scene, 'MN_import_del_solvent', icon_value=0)

molecularnodes/io/pdb.py

@@ -1,7 +1,7 @@
 import bpy
 from pathlib import Path
 import numpy as np
-
+from .. import pkg
 from .load import create_molecule
 from ..blender import nodes
 from .. import assembly
@@ -179,6 +179,10 @@ def panel(layout, scene):
     col.prop(scene, 'MN_cache_dir', text = "Cache")
     col.enabled = scene.MN_cache
     grid = options.grid_flow()
-    for property in ['MN_import_build_assembly', 'MN_import_centre', 'MN_import_del_solvent']:
-        grid.prop(scene, property)
-
+    row = grid.row().column()
+    if not pkg.is_current('scipy'):
+        row.enabled = False
+        row.label(text = 'For assemblies, install scipy in add-on preferences.')
+    row.prop(scene, 'MN_import_build_assembly')
+    grid.prop(scene, 'MN_import_centre')
+    grid.prop(scene, 'MN_import_del_solvent')

molecularnodes/ui/panel.py

@@ -40,9 +40,9 @@
 }
 
 packages = {
-    'pdb': ['biotite', 'scipy'], 
+    'pdb': ['biotite'], 
     'star': ['starfile', 'eulerangles'], 
-    'local': ['biotite', 'scipy'], 
+    'local': ['biotite'], 
     'cellpack': ['biotite', 'msgpack', 'scipy'], 
     'md': ['MDAnalysis'], 
     'density': ['mrcfile', 'scipy'],

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "molecularnodes"
-version = "4.0.2"
+version = "4.0.3"
 description = "Toolbox for molecular animations with Blender and Geometry Nodes."
 authors = ["Brady Johnston <[email protected]>"]
 license = "MIT"