update CHANGES

Author: oesteban

CHANGES

@@ -1,6 +1,8 @@
 Next release
 ============
 
+* ENH: Added interface to simulate DWIs using the multi-tensor model
+       (https://github.com/nipy/nipype/pull/1085)
 * ENH: New mesh.MeshWarpMaths to operate on surface-defined warpings
        (https://github.com/nipy/nipype/pull/1016)
 * FIX: Refactor P2PDistance, change name to ComputeMeshWarp, add regression tests,

nipype/interfaces/base.py

@@ -1349,9 +1349,9 @@ def _terminal_output_update(self):
     def set_default_terminal_output(cls, output_type):
         """Set the default terminal output for CommandLine Interfaces.
 
-        This method is used to set default terminal output for 
-        CommandLine Interfaces.  However, setting this will not 
-        update the output type for any existing instances.  For these, 
+        This method is used to set default terminal output for
+        CommandLine Interfaces.  However, setting this will not
+        update the output type for any existing instances.  For these,
         assign the <instance>.inputs.terminal_output.
         """
 

nipype/testing/data/von-ray_errmap.nii.gz

@@ -19,7 +19,7 @@ def add_options(parser=None, module=None, function=None):
     if parser and module and function:
         __import__(module)
         interface = getattr(sys.modules[module],function)()
-        
+
         inputs = interface.input_spec()
         for name, spec in sorted(interface.inputs.traits(transient=None).items()):
             desc = "\n".join(interface._get_trait_desc(inputs, name, spec))[len(name)+2:]
@@ -33,7 +33,7 @@ def add_options(parser=None, module=None, function=None):
 def run_instance(interface, options):
     if interface:
         print "setting function inputs"
-            
+
         for input_name, _ in interface.inputs.items():
             if getattr(options, input_name) != None:
                 value = getattr(options, input_name)
@@ -48,23 +48,23 @@ def run_instance(interface, options):
                             value)
                 except ValueError, e:
                     print "Error when setting the value of %s: '%s'"%(input_name, str(e))
-                    
+
         print interface.inputs
         res = interface.run()
-        print res.outputs    
+        print res.outputs
 
 
 def main(argv):
-    
+
     if len(argv) == 2 and not argv[1].startswith("-"):
         listClasses(argv[1])
         sys.exit(0)
-    
+
     parser = argparse.ArgumentParser(description='Nipype interface runner', prog=argv[0])
     parser.add_argument("module", type=str, help="Module name")
     parser.add_argument("interface", type=str, help="Interface name")
     parsed = parser.parse_args(args=argv[1:3])
-    
+
     _, prog = os.path.split(argv[0])
     interface_parser = argparse.ArgumentParser(description="Run %s"%parsed.interface, prog=" ".join([prog] + argv[1:3]))
     interface_parser, interface  = add_options(interface_parser, parsed.module, parsed.interface)

nipype/testing/data/von_errmap.nii.gz

@@ -22,24 +22,24 @@ def test_main_returns_2_on_empty(self):
         with self.assertRaises(SystemExit) as cm:
             with capture_sys_output() as (stdout, stderr):
                 nipype_cmd.main(['nipype_cmd'])
-        
+
         exit_exception = cm.exception
         self.assertEqual(exit_exception.code, 2)
-        
-        self.assertEqual(stderr.getvalue(), 
+
+        self.assertEqual(stderr.getvalue(),
 """usage: nipype_cmd [-h] module interface
 nipype_cmd: error: too few arguments
 """)
         self.assertEqual(stdout.getvalue(), '')
-        
+
     def test_main_returns_0_on_help(self):
         with self.assertRaises(SystemExit) as cm:
             with capture_sys_output() as (stdout, stderr):
                 nipype_cmd.main(['nipype_cmd', '-h'])
-        
+
         exit_exception = cm.exception
         self.assertEqual(exit_exception.code, 0)
-        
+
         self.assertEqual(stderr.getvalue(), '')
         self.assertEqual(stdout.getvalue(),
 """usage: nipype_cmd [-h] module interface
@@ -53,15 +53,15 @@ def test_main_returns_0_on_help(self):
 optional arguments:
   -h, --help  show this help message and exit
 """)
-    
+
     def test_list_nipy_interfacesp(self):
         with self.assertRaises(SystemExit) as cm:
             with capture_sys_output() as (stdout, stderr):
                 nipype_cmd.main(['nipype_cmd', 'nipype.interfaces.nipy'])
-        
+
         exit_exception = cm.exception
         self.assertEqual(exit_exception.code, 0)
-        
+
         self.assertEqual(stderr.getvalue(), '')
         self.assertEqual(stdout.getvalue(),
 """Available Interfaces:
@@ -77,10 +77,10 @@ def test_run_4d_realign_without_arguments(self):
         with self.assertRaises(SystemExit) as cm:
             with capture_sys_output() as (stdout, stderr):
                 nipype_cmd.main(['nipype_cmd', 'nipype.interfaces.nipy', 'FmriRealign4d'])
-        
+
         exit_exception = cm.exception
         self.assertEqual(exit_exception.code, 2)
-        
+
         self.assertEqual(stderr.getvalue(),
 """usage: nipype_cmd nipype.interfaces.nipy FmriRealign4d [-h]
                                                        [--between_loops BETWEEN_LOOPS]
@@ -95,15 +95,15 @@ def test_run_4d_realign_without_arguments(self):
 nipype_cmd nipype.interfaces.nipy FmriRealign4d: error: too few arguments
 """)
         self.assertEqual(stdout.getvalue(), '')
-        
+
     def test_run_4d_realign_help(self):
         with self.assertRaises(SystemExit) as cm:
             with capture_sys_output() as (stdout, stderr):
                 nipype_cmd.main(['nipype_cmd', 'nipype.interfaces.nipy', 'FmriRealign4d', '-h'])
-        
+
         exit_exception = cm.exception
         self.assertEqual(exit_exception.code, 0)
-        
+
         self.assertEqual(stderr.getvalue(), '')
         self.assertTrue("Run FmriRealign4d" in stdout.getvalue())