Merge remote-tracking branch 'upstream/master' into enh/revising-popen-calls

Author: oesteban

.circleci/config.yml

@@ -137,17 +137,13 @@ jobs:
               docker save nipype/nipype:base \
                           nipype/nipype:latest \
                           nipype/nipype:py36 \
-                          nipype/nipype:py27 | gzip -6 > /tmp/docker/nipype-base-latest-py36-py27.tar.gz
+                          nipype/nipype:py27 | gzip -1 > /tmp/docker/nipype-base-latest-py36-py27.tar.gz
               du -h /tmp/docker/nipype-base-latest-py36-py27.tar.gz
-            else
-              # Workaround for `persist_to_workspace` to succeed when we are
-              # not deploying Docker images.
-              touch /tmp/docker/nipype-base-latest-py36-py27.tar.gz
             fi
       - persist_to_workspace:
           root: /tmp
           paths:
-            - docker/nipype-base-latest-py36-py27.tar.gz
+            - docker/*
 
 
   deploy:

nipype/interfaces/afni/preprocess.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/interfaces/afni/utils.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
 

nipype/interfaces/ants/resampling.py

@@ -75,7 +75,7 @@ class WarpTimeSeriesImageMultiTransform(ANTSCommand):
     >>> wtsimt.inputs.reference_image = 'ants_deformed.nii.gz'
     >>> wtsimt.inputs.transformation_series = ['ants_Warp.nii.gz','ants_Affine.txt']
     >>> wtsimt.inputs.invert_affine = [1] # # this will invert the 1st Affine file: ants_Affine.txt
-    >>> wtsimt.cmdline # doctest: +ALLOW_UNICODE
+    >>> wtsimt.cmdline
     'WarpTimeSeriesImageMultiTransform 4 resting.nii resting_wtsimt.nii -R ants_deformed.nii.gz ants_Warp.nii.gz \
 -i ants_Affine.txt'
     """