Merge pull request #550 from oesteban/enh/finish-ants-upstreaming-2

MAINT: Finalize upstreaming of ants interfaces to nipype

Author: oesteban

docs/requirements.txt

@@ -1,7 +1,7 @@
 git+https://github.com/AleksandarPetrov/napoleon.git@0dc3f28a309ad602be5f44a9049785a1026451b3#egg=sphinxcontrib-napoleon
 git+https://github.com/rwblair/sphinxcontrib-versioning.git@39b40b0b84bf872fc398feff05344051bbce0f63#egg=sphinxcontrib-versioning
 nbsphinx
-nipype>=1.3.1
+git+https://github.com/nipy/nipype.git@master#egg=nipype
 nitransforms >= 20.0.0rc3,<20.2
 packaging
 pydot>=1.2.3

niworkflows/anat/ants.py

@@ -13,18 +13,20 @@
 from nipype.pipeline import engine as pe
 from nipype.interfaces import utility as niu
 from nipype.interfaces.fsl.maths import ApplyMask
-from nipype.interfaces.ants import N4BiasFieldCorrection, Atropos, MultiplyImages
+from nipype.interfaces.ants import (
+    AI,
+    Atropos,
+    ImageMath,
+    MultiplyImages,
+    N4BiasFieldCorrection,
+    ResampleImageBySpacing,
+    ThresholdImage,
+)
 
 from ..utils.misc import get_template_specs
 from ..utils.connections import pop_file as _pop
 
 # niworkflows
-from ..interfaces.ants import (
-    ImageMath,
-    ResampleImageBySpacing,
-    AI,
-    ThresholdImage,
-)
 from ..interfaces.fixes import (
     FixHeaderRegistration as Registration,
     FixHeaderApplyTransforms as ApplyTransforms,

niworkflows/func/util.py

@@ -6,11 +6,11 @@
 
 from nipype.pipeline import engine as pe
 from nipype.interfaces import utility as niu, fsl, afni
+from nipype.interfaces.ants.utils import AI
 
 from templateflow.api import get as get_template
 
 from ..engine.workflows import LiterateWorkflow as Workflow
-from ..interfaces.ants import AI
 from ..interfaces.fixes import (
     FixHeaderRegistration as Registration,
     FixHeaderApplyTransforms as ApplyTransforms,