Skip to content

Commit

Permalink
Merge pull request #430 from BradyAJohnston/dev-cleanup
Browse files Browse the repository at this point in the history
minor cleanup
  • Loading branch information
BradyAJohnston authored Feb 14, 2024
2 parents 9d5430d + 09ec871 commit 7984274
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion molecularnodes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"author": "Brady Johnston",
"description": "Toolbox for molecular animations in Blender & Geometry Nodes.",
"blender": (4, 0, 0),
"version": (4, 0, 9),
"version": (4, 0, 10),
"location": "Scene Properties -> Molecular Nodes",
"warning": "",
"doc_url": "https://bradyajohnston.github.io/MolecularNodes/",
Expand Down
Binary file modified molecularnodes/assets/template/Molecular Nodes.zip
Binary file not shown.
Binary file modified molecularnodes/assets/template/Molecular Nodes/startup.blend
Binary file not shown.
2 changes: 1 addition & 1 deletion molecularnodes/io/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def execute(self, context):
)

# return the good news!
bpy.context.view_layer.objects.active = mol
bpy.context.view_layer.objects.active = mol.object
self.report({'INFO'}, message=f"Imported '{file_path}' as {mol.name}")
return {"FINISHED"}

Expand Down
7 changes: 7 additions & 0 deletions molecularnodes/io/parse/molecule.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ def __init__(self):
self.entity_ids: Optional[np.ndarray] = None
self.chain_ids: Optional[np.ndarray] = None

@property
def name(self) -> Optional[str]:
if self.object is not None:
return self.object.name
else:
return None

def set_attribute(
self,
data: np.ndarray,
Expand Down
15 changes: 7 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "molecularnodes"
version = "4.0.9"
version = "4.0.10"
description = "Toolbox for molecular animations with Blender and Geometry Nodes."
authors = ["Brady Johnston <[email protected]>"]
license = "MIT"
Expand All @@ -12,12 +12,12 @@ documentation = "https://bradyajohnston.github.io/MolecularNodes"

[tool.poetry.dependencies]
python = "~=3.10.0"
bpy = ">=4.0"
MDAnalysis = ">=2.7.0"
biotite = "==0.37.0"
mrcfile = "1.4.3"
starfile = "0.5.1"
msgpack = "1.0.7"
bpy = "~=4.0"
MDAnalysis = "~=2.7.0"
biotite = "~=0.37.0"
mrcfile = "~=1.4.3"
starfile = "~=0.5.1"
msgpack = "~=1.0.7"

[tool.poetry.dev-dependencies]
pytest = "*"
Expand All @@ -31,4 +31,3 @@ requires = ["poetry-core>=1.1.0"]
build-backend = "poetry.core.masonry.api"

[tool.setuptools_scm]

0 comments on commit 7984274

Please sign in to comment.