Revert "Extended MRtrix3 interface"

This reverts commit bb9f5b4.

Author: matteomancini

doc/users/config_file.rst

@@ -74,11 +74,11 @@ Execution
 
 *display_variable*
 	Override the ``$DISPLAY`` environment variable for interfaces that require
-    an X server. This option is useful if there is a running X server, but
-    ``$DISPLAY`` was not defined in nipype's environment. For example, if an X
+    an X server. This option is useful if there is a running X server, but 
+    ``$DISPLAY`` was not defined in nipype's environment. For example, if an X 
     server is listening on the default port of 6000, set ``display_variable = :0``
-    to enable nipype interfaces to use it. It may also point to displays provided
-    by VNC, `xnest <http://www.x.org/archive/X11R7.5/doc/man/man1/Xnest.1.html>`_
+    to enable nipype interfaces to use it. It may also point to displays provided 
+    by VNC, `xnest <http://www.x.org/archive/X11R7.5/doc/man/man1/Xnest.1.html>`_ 
     or `Xvfb <http://www.x.org/archive/X11R6.8.1/doc/Xvfb.1.html>`_.
     If neither ``display_variable`` nor the ``$DISPLAY`` environment variable are
     set, nipype will try to configure a new virtual server using Xvfb.

doc/users/plugins.rst

@@ -82,9 +82,9 @@ Optional arguments::
   exceed the total amount of resources available (memory and threads), when
   ``False`` (default), only a warning will be issued.
 
-  maxtasksperchild : number of nodes to run on each process before refreshing
+  maxtasksperchild : number of nodes to run on each process before refreshing 
   the worker (default: 10).
-
+  
 
 To distribute processing on a multicore machine, simply call::
 

nipype/algorithms/tests/test_auto_CompCor.py

@@ -15,7 +15,7 @@
 
 @pytest.mark.skipif(VTKInfo.no_tvtk(), reason="tvtk is not installed")
 def test_ident_distances(tmpdir):
-    tmpdir.chdir()
+    tmpdir.chdir() 
 
     in_surf = example_data('surf01.vtk')
     dist_ident = m.ComputeMeshWarp()

nipype/algorithms/tests/test_auto_ErrorMap.py

@@ -3490,7 +3490,7 @@ class Qwarp(AFNICommand):
     >>> qwarp3.inputs.base_file = 'mni.nii'
     >>> qwarp3.inputs.allineate = True
     >>> qwarp3.inputs.allineate_opts = '-cose lpa -verb'
-    >>> qwarp3.cmdline  # doctest: +ALLOW_UNICODE
+    >>> qwarp3.cmdline
     "3dQwarp -allineate -allineate_opts '-cose lpa -verb' -base mni.nii -source structural.nii -prefix structural_QW"
     >>> res3 = qwarp3.run()  # doctest: +SKIP    """
     _cmd = '3dQwarp'

nipype/algorithms/tests/test_auto_Overlap.py

@@ -1674,7 +1674,7 @@ class NwarpCat(AFNICommand):
     >>> nwarpcat = afni.NwarpCat()
     >>> nwarpcat.inputs.in_files = ['Q25_warp+tlrc.HEAD', ('IDENT', 'structural.nii')]
     >>> nwarpcat.inputs.out_file = 'Fred_total_WARP'
-    >>> nwarpcat.cmdline  # doctest: +ALLOW_UNICODE
+    >>> nwarpcat.cmdline
     "3dNwarpCat -prefix Fred_total_WARP Q25_warp+tlrc.HEAD 'IDENT(structural.nii)'"
     >>> res = nwarpcat.run()  # doctest: +SKIP