merge upstream master

Author: mgxd

nipype/algorithms/tests/test_auto_FramewiseDisplacement.py

@@ -11,7 +11,8 @@ def test_FramewiseDisplacement_inputs():
     ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
-    in_plots=dict(),
+    in_plots=dict(mandatory=True,
+    ),
     normalize=dict(usedefault=True,
     ),
     out_figure=dict(usedefault=True,

nipype/algorithms/tests/test_auto_TSNR.py

@@ -1,6 +1,6 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from ...testing import assert_equal
-from ..misc import TSNR
+from ..confounds import TSNR
 
 
 def test_TSNR_inputs():