Skip to content

Commit be92984

Browse files
authored
Merge pull request #464 from OpenBioSim/backport_463
Backport fixes from PR #463
2 parents ecf8f1f + b09c347 commit be92984

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

python/BioSimSpace/Align/_align.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2450,7 +2450,7 @@ def _draw_molecules(
24502450

24512451
# standard settings for visualization
24522452
d2d.drawOptions().useBWAtomPalette()
2453-
d2d.drawOptions().continousHighlight = False
2453+
d2d.drawOptions().continuousHighlight = False
24542454
d2d.drawOptions().setHighlightColour(highlight_color)
24552455
d2d.drawOptions().addAtomIndices = True
24562456
d2d.DrawMolecules(

python/BioSimSpace/Node/_node.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ def run(name, args={}, work_dir=None):
105105
106106
work_dir : str, optional
107107
The working directory in which to run the node. If not specified,
108-
the current working directory is used.
108+
the current working directory is used. Note that inputs should
109+
use absolute paths if this is set.
109110
110111
Returns
111112
-------
@@ -142,7 +143,7 @@ def run(name, args={}, work_dir=None):
142143
else:
143144
full_name += ".py"
144145

145-
with _Utils.chdir(work_dir):
146+
with _Utils.cd(work_dir):
146147
# Write a YAML configuration file for the BioSimSpace node.
147148
if len(args) > 0:
148149
with open("input.yaml", "w") as file:
@@ -196,6 +197,9 @@ def setNodeDirectory(dir):
196197
if not _os.path.isdir(dir):
197198
raise IOError("Node directory '%s' doesn't exist!" % dir)
198199

200+
# Use the absolute path.
201+
dir = _os.path.abspath(dir)
202+
199203
global _node_dir
200204
_node_dir = dir
201205

python/BioSimSpace/Sandpit/Exscientia/Node/_node.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ def run(name, args={}, work_dir=None):
105105
106106
work_dir : str, optional
107107
The working directory in which to run the node. If not specified,
108-
the current working directory is used.
108+
the current working directory is used. Note that inputs should
109+
use absolute paths if this is set.
109110
110111
Returns
111112
-------
@@ -142,7 +143,7 @@ def run(name, args={}, work_dir=None):
142143
else:
143144
full_name += ".py"
144145

145-
with _Utils.chdir(work_dir):
146+
with _Utils.cd(work_dir):
146147
# Write a YAML configuration file for the BioSimSpace node.
147148
if len(args) > 0:
148149
with open("input.yaml", "w") as file:
@@ -196,6 +197,9 @@ def setNodeDirectory(dir):
196197
if not _os.path.isdir(dir):
197198
raise IOError("Node directory '%s' doesn't exist!" % dir)
198199

200+
# Use the absolute path.
201+
dir = _os.path.abspath(dir)
202+
199203
global _node_dir
200204
_node_dir = dir
201205

0 commit comments

Comments
 (0)