Merge pull request #939 from mgxd/fix/tagging

FIX: Allow passing arguments through tag decorator

Author: mgxd

niworkflows/engine/splicer.py

@@ -2,6 +2,7 @@
 
 import logging
 import typing as ty
+from functools import wraps
 
 import nipype.pipeline.engine as pe
 from nipype.pipeline.engine.base import EngineBase
@@ -14,8 +15,9 @@ def tag(tag: str) -> ty.Callable:
     This is used to mark nodes or workflows for replacement in the splicing process.
     """
 
-    def _decorator(func, *args, **kwargs) -> ty.Callable:
-        def _tag() -> EngineBase:
+    def _decorator(func) -> ty.Callable:
+        @wraps(func)
+        def _tag(*args, **kwargs) -> EngineBase:
             node = func(*args, **kwargs)
             node._tag = tag
             return node

niworkflows/engine/tests/test_splicer.py

@@ -155,9 +155,11 @@ def test_splice(wf0):
     assert wf.get_node('c_wf') is None
 
 
-def test_tag():
-    @tag('foo')
-    def init_workflow():
-        return Workflow(name='foo')
-
-    assert init_workflow()._tag == 'foo'
+@pytest.mark.parametrize('name', ['foo'])
+def test_tag(name):
+    @tag(name)
+    def init_workflow(name, *, xarg: str):
+        return Workflow(name=name)
+
+    wf = init_workflow(name, xarg='bar')
+    assert wf._tag == name