sty

Author: oesteban

nipype/pipeline/engine/base.py

@@ -59,10 +59,9 @@ def name(self):
 
     @name.setter
     def name(self, name):
-        if name and bool(re.match(r'^[\w_]+$', name)):
-            self._name = name
-        else:
+        if not name or not re.match(r'^[\w-]+$', name):
             raise ValueError('[Workflow|Node] name "%s" is not valid.' % name)
+        self._name = name
 
     @property
     def fullname(self):

nipype/pipeline/engine/tests/test_base.py

@@ -32,14 +32,15 @@ def _list_outputs(self):
         return outputs
 
 
-@pytest.mark.parametrize('name', ['valid1', 'valid_node', 'ValidNode0'])
+@pytest.mark.parametrize(
+    'name', ['valid1', 'valid_node', 'valid-node', 'ValidNode0'])
 def test_create(name):
     base = EngineBase(name=name)
     assert base.name == name
 
 
 @pytest.mark.parametrize(
-    'name', ['invalid-1', 'invalid.1', 'invalid@', 'in/valid', None])
+    'name', ['invalid*1', 'invalid.1', 'invalid@', 'in/valid', None])
 def test_create_invalid(name):
     with pytest.raises(ValueError):
         EngineBase(name=name)