Merge pull request #347 from BradyAJohnston/fix-msgpack

Fixes #345

molecularnodes/__init__.py

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

molecularnodes/bcif.py

@@ -1,5 +1,6 @@
 import numpy as np
 import warnings
+from typing import Any, Dict, List, Optional, TypedDict, Union
 
 
 def rotation_from_matrix(matrix):
@@ -149,10 +150,7 @@ def atom_array_from_bcif(open_bcif):
 # - https://github.com/molstar/molstar/blob/master/src/mol-io/common/binary-cif/decoder.ts
 # - https://github.com/molstar/molstar/blob/master/src/mol-io/reader/cif/binary/parser.ts
 
-from typing import Any, Dict, List, Optional, TypedDict, Union
 
-import msgpack
-import numpy as np
 
 
 class EncodingBase(TypedDict):
@@ -513,6 +511,7 @@ def loads(data: Union[bytes, EncodedFile], lazy=True) -> CifFile:
         - True: individual columns are decoded only when accessed
         - False: decode all columns immediately
     """
+    import msgpack
 
     file: EncodedFile = data if isinstance(data, dict) and "dataBlocks" in data else msgpack.loads(data)  # type: ignore
 

molecularnodes/ui.py

@@ -153,6 +153,10 @@ def MN_PT_panel_ui(layout_function, scene):
                 box.label(text = f"Please install '{name}' in the addon preferences.")
         star.panel(box, scene)
     elif panel_selection == 6:
+        if not pkg.is_current('biotite'):
+            box.enabled = False
+            box.alert = True
+            box.label(text = "Please install biotite in the addon preferences.")
         pack.panel(box, scene)
 
 class MN_PT_panel(bpy.types.Panel):

pyproject.toml

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

tests/snapshots/test_attributes/test_attribute/8U8W/att_bond_type_values.txt

@@ -1,3 +1,3 @@
-[1 1 1 1 1 1 2 1 1 1 2 1 1 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 1 1
- 1 2 1 1 2 1 1 2 1 1 1 2 1 1 1 1 1 1 1 2 1 1 2 2 1 2 1 1 1 1 1 1 1 2 1 1 1
- 2 1 2 1 1 1 1 1 1 1 2 1 1 1 1 1 2 1 1 1 1 1 1 1 1 2]
+[1 1 1 1 1 2 1 1 1 2 1 1 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 1 1 1
+ 2 1 1 2 1 1 2 1 1 1 2 1 1 1 1 1 1 1 2 1 1 2 2 1 2 1 1 1 1 1 1 1 2 1 1 1 2
+ 1 2 1 1 1 1 1 1 1 2 1 1 1 1 1 2 1 1 1 1 1 1 1 1 2 1]