Merge branch 'ref/interface-base' of github.com:oesteban/nipype into ref/interface-base

Author: oesteban

.zenodo.json

@@ -1,4 +1,4 @@
-Upcoming release
+Upcoming release (0.14.1)
 ================
 
 

CHANGES

@@ -82,7 +82,7 @@
 # The short X.Y version.
 version = nipype.__version__
 # The full version, including alpha/beta/rc tags.
-release = "0.14.0-rc1"
+release = "0.14.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/conf.py

@@ -10,7 +10,7 @@
 # full release.  '.dev' as a version_extra string means this is a development
 # version
 # Remove -dev for release
-__version__ = '0.14.0-rc1'
+__version__ = '0.14.1-dev'
 
 
 def get_nipype_gitversion():

nipype/info.py

@@ -26,7 +26,9 @@ def test_ANTS_inputs():
     ),
     metric=dict(mandatory=True,
     ),
-    metric_weight=dict(requires=['metric'],
+    metric_weight=dict(mandatory=True,
+    requires=['metric'],
+    usedefault=True,
     ),
     mi_option=dict(argstr='--MI-option %s',
     sep='x',
@@ -49,7 +51,8 @@ def test_ANTS_inputs():
     mandatory=True,
     usedefault=True,
     ),
-    radius=dict(requires=['metric'],
+    radius=dict(mandatory=True,
+    requires=['metric'],
     ),
     regularization=dict(argstr='%s',
     ),

nipype/interfaces/ants/tests/test_auto_ANTS.py

@@ -252,30 +252,30 @@ def get_hashval(self, hash_method=None):
 
         Returns
         -------
-        dict_withhash : dict
+        list_withhash : dict
             Copy of our dictionary with the new file hashes included
             with each file.
         hashvalue : str
             The md5 hash value of the traited spec
 
         """
 
-        dict_withhash = []
-        dict_nofilename = []
+        list_withhash = []
+        list_nofilename = []
         for name, val in sorted(self.get().items()):
             if not isdefined(val) or self.has_metadata(name, "nohash", True):
                 # skip undefined traits and traits with nohash=True
                 continue
 
             hash_files = (not self.has_metadata(name, "hash_files", False) and not
                           self.has_metadata(name, "name_source"))
-            dict_nofilename.append((name,
+            list_nofilename.append((name,
                                     self._get_sorteddict(val, hash_method=hash_method,
                                                          hash_files=hash_files)))
-            dict_withhash.append((name,
+            list_withhash.append((name,
                                   self._get_sorteddict(val, True, hash_method=hash_method,
                                                        hash_files=hash_files)))
-        return dict_withhash, md5(to_str(dict_nofilename).encode()).hexdigest()
+        return list_withhash, md5(to_str(list_nofilename).encode()).hexdigest()
 
     def _get_sorteddict(self, objekt, dictwithhash=False, hash_method=None,
                         hash_files=True):

nipype/interfaces/base/specs.py

@@ -49,7 +49,6 @@ class Bunch(object):
     >>> inputs
     Bunch(fwhm=6.0, infile='subj.nii', register_to_mean=False)
 
-
     Notes
     -----
     The Bunch pattern came from the Python Cookbook:

nipype/interfaces/base/support.py

@@ -2173,7 +2173,7 @@ def _list_outputs(self):
 
 
 def load_template(name):
-    """Load a template from the script_templates directory
+    """Load a template from the model_templates directory
 
     Parameters
     ----------
@@ -2186,8 +2186,8 @@ def load_template(name):
 
     """
     from pkg_resources import resource_filename as pkgrf
-    full_fname = pkgrf('nipype',
-                       os.path.join('script_templates', name))
+    full_fname = pkgrf(
+        'nipype', os.path.join('interfaces', 'fsl', 'model_templates', name))
     with open(full_fname) as template_file:
         template = Template(template_file.read())