applied remaining suggestions from Chris' review

Author: tclose

pydra/engine/core.py

@@ -3,6 +3,7 @@
 import json
 import logging
 import itertools
+from functools import cached_property
 import os
 import sys
 from pathlib import Path
@@ -229,12 +230,9 @@ def __setstate__(self, state):
         state["inputs"] = make_klass(state["input_spec"])(**state["inputs"])
         self.__dict__.update(state)
 
-    @property
+    @cached_property
     def lzout(self):
-        if self._lzout:
-            return self._lzout
-        self._lzout = LazyOut(self)
-        return self._lzout
+        return LazyOut(self)
 
     def help(self, returnhelp=False):
         """Print class help."""

pydra/engine/helpers_file.py

@@ -57,9 +57,9 @@ def copy_nested_files(
     supported_modes: FileSet.CopyMode = FileSet.CopyMode.any,
     **kwargs,
 ) -> ty.Any:
-    """Copies all "file-sets" found with the nested value into the destination
-    directory. If no nested file-sets are found then the original value is returned. Note
-    that multiple nested file-sets (e.g. a list) will to have unique names
+    """Copies all "file-sets" found within the nested value (e.g. dict, list,...) into the
+    destination directory. If no nested file-sets are found then the original value is
+    returned. Note that multiple nested file-sets (e.g. a list) will to have unique names
     names (i.e. not differentiated by parent directories) otherwise there will be a path
     clash in the destination directory.
 

pydra/engine/tests/test_submitter.py

@@ -573,7 +573,7 @@ def test_sge_no_limit_maxthreads(tmpdir):
     assert job_1_endtime > job_2_starttime
 
 
-@pytest.mark.xfail(reason="Not sure")
+# @pytest.mark.xfail(reason="Not sure")
 def test_wf_with_blocked_tasks(tmpdir):
     wf = Workflow(name="wf_with_blocked_tasks", input_spec=["x"])
     wf.add(identity(name="taska", x=wf.lzin.x))
@@ -585,17 +585,17 @@ def test_wf_with_blocked_tasks(tmpdir):
 
     wf.cache_dir = tmpdir
 
-    with pytest.raises(Exception, match="graph is not empty,"):
-        with Submitter("serial") as sub:
-            sub(wf)
+    # with pytest.raises(Exception, match="graph is not empty,"):
+    with Submitter("serial") as sub:
+        sub(wf)
 
 
 class A:
     def __init__(self, a):
         self.a = a
 
-    def __hash__(self):
-        return hash(self.a)
+    def __bytes_repr__(self, cache):
+        yield bytes(self.a)
 
 
 @mark.task

pydra/engine/tests/test_task.py

@@ -22,7 +22,6 @@
 )
 from ...utils.hash import hash_function
 
-# from ..helpers import hash_file
 
 no_win = pytest.mark.skipif(
     sys.platform.startswith("win"),

pydra/engine/tests/test_tasks_files.py

@@ -94,7 +94,7 @@ def test_wf_1(tmpdir):
     np.save(file_orig, arr)
     wf.inputs.file_orig = file_orig
 
-    with Submitter(plugin="serial") as sub:
+    with Submitter(plugin="cf") as sub:
         sub(wf)
 
     assert wf.output_dir.exists()

pydra/engine/tests/test_workflow.py

@@ -106,7 +106,7 @@ def test_wf_dict_input_and_output_spec():
         wf.inputs.a = 1.0
     with pytest.raises(
         TypeError,
-        match=("Could not coerce object, bad-value, to any of the union types "),
+        match=("Could not coerce object, 'bad-value', to any of the union types "),
     ):
         wf.inputs.b = {"foo": 1, "bar": "bad-value"}
 

pydra/utils/typing.py

@@ -213,7 +213,7 @@ def coerce_union(obj, pattern_args):
                 except TypeError as e:
                     reasons.append(e)
             raise TypeError(
-                f"Could not coerce object, {obj}, to any of the union types {pattern_args}:\n\n"
+                f"Could not coerce object, {obj!r}, to any of the union types {pattern_args}:\n\n"
                 + "\n\n".join(f"{a} -> {e}" for a, e in zip(pattern_args, reasons))
             )