Merge pull request #1133 from effigies/pin/niworkflows

RF: Resume external nipype dependency

Author: effigies

.circleci/config.yml

@@ -296,10 +296,10 @@ jobs:
           at: /tmp
       - restore_cache:
           keys:
-            - ds005-anat-v6-{{ .Branch }}-{{ epoch }}
-            - ds005-anat-v6-{{ .Branch }}
-            - ds005-anat-v6-master
-            - ds005-anat-v6-
+            - ds005-anat-v7-{{ .Branch }}-{{ epoch }}
+            - ds005-anat-v7-{{ .Branch }}
+            - ds005-anat-v7-master
+            - ds005-anat-v7-
       - run:
           name: Setting up test
           command: |
@@ -333,7 +333,7 @@ jobs:
                 --debug --write-graph --mem_mb 4096 \
                 --nthreads 2 --anat-only -vv
       - save_cache:
-         key: ds005-anat-v6-{{ .Branch }}-{{ epoch }}
+         key: ds005-anat-v7-{{ .Branch }}-{{ epoch }}
          paths:
             - /tmp/ds005/work
             - /tmp/ds005/derivatives/fmriprep
@@ -425,10 +425,10 @@ jobs:
           at: /tmp
       - restore_cache:
           keys:
-            - ds054-anat-v4-{{ .Branch }}-{{ epoch }}
-            - ds054-anat-v4-{{ .Branch }}
-            - ds054-anat-v4-master
-            - ds054-anat-v4-
+            - ds054-anat-v5-{{ .Branch }}-{{ epoch }}
+            - ds054-anat-v5-{{ .Branch }}
+            - ds054-anat-v5-master
+            - ds054-anat-v5-
       - run:
           name: Setting up test
           command: |
@@ -462,7 +462,7 @@ jobs:
                 --fs-no-reconall --debug --write-graph \
                 --mem_mb 4096 --nthreads 2 --anat-only -vv
       - save_cache:
-         key: ds054-anat-v4-{{ .Branch }}-{{ epoch }}
+         key: ds054-anat-v5-{{ .Branch }}-{{ epoch }}
          paths:
             - /tmp/ds054/work
             - /tmp/ds054/derivatives
@@ -543,8 +543,8 @@ jobs:
           at: /tmp
       - restore_cache:
           keys:
-            - ds210-anat-v1-{{ epoch }}
-            - ds210-anat-v1-
+            - ds210-anat-v2-{{ epoch }}
+            - ds210-anat-v2-
       - run:
           name: Setting up test
           command: |
@@ -578,7 +578,7 @@ jobs:
                 --fs-no-reconall --debug --write-graph \
                 --mem_mb 4096 --nthreads 2 --anat-only -vv
       - save_cache:
-         key: ds210-anat-v1-{{ epoch }}
+         key: ds210-anat-v2-{{ epoch }}
          paths:
             - /tmp/ds210/work
             - /tmp/ds210/derivatives

docs/environment.yml

@@ -28,4 +28,4 @@ dependencies:
     - svgutils
     - nitime
     - nilearn
-    - niworkflows>=0.3.13
+    - niworkflows>=0.4.0

fmriprep/cli/fmriprep_bold_mask.py

@@ -3,7 +3,7 @@
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 """Run the BOLD reference+mask workflow"""
 import os
-from niworkflows.nipype.utils.filemanip import hash_infile
+from nipype.utils.filemanip import hash_infile
 
 
 def get_parser():

fmriprep/cli/run.py

@@ -228,7 +228,7 @@ def get_parser():
 
 def main():
     """Entry point"""
-    from niworkflows.nipype import logging as nlogging
+    from nipype import logging as nlogging
     from multiprocessing import set_start_method, Process, Manager
     from ..viz.reports import generate_reports
     from ..info import __version__
@@ -335,7 +335,7 @@ def build_workflow(opts, retval):
     a hard-limited memory-scope.
 
     """
-    from niworkflows.nipype import logging, config as ncfg
+    from nipype import logging, config as ncfg
     from ..info import __version__
     from ..workflows.base import init_fmriprep_wf
     from ..utils.bids import collect_participants

fmriprep/info.py

@@ -70,7 +70,8 @@
     'grabbit',
     'pybids>=0.5.1',
     'nitime',
-    'niworkflows>=0.3.13',
+    'nipype>=1.0.4',
+    'niworkflows>=0.4.0',
     'statsmodels',
     'nipype',
     'seaborn',

fmriprep/interfaces/bids.py

@@ -14,8 +14,8 @@
 
 Disable warnings:
 
-    >>> import niworkflows.nipype as nn
-    >>> nn.logging.getLogger('interface').setLevel('ERROR')
+    >>> from nipype import logging
+    >>> logging.getLogger('interface').setLevel('ERROR')
 
 """
 
@@ -26,13 +26,13 @@
 import gzip
 from shutil import copytree, rmtree, copyfileobj
 
-from niworkflows.nipype import logging
-from niworkflows.nipype.interfaces.base import (
+from nipype import logging
+from nipype.interfaces.base import (
     traits, isdefined, TraitedSpec, BaseInterfaceInputSpec,
     File, Directory, InputMultiPath, OutputMultiPath, Str,
     SimpleInterface
 )
-from niworkflows.nipype.utils.filemanip import copyfile
+from nipype.utils.filemanip import copyfile
 
 LOGGER = logging.getLogger('interface')
 BIDS_NAME = re.compile(

fmriprep/interfaces/cifti.py

@@ -17,12 +17,12 @@
 import numpy as np
 from nilearn.image import resample_to_img
 
-from niworkflows.nipype.interfaces.base import (
+from nipype.interfaces.base import (
     BaseInterfaceInputSpec, TraitedSpec, File, traits,
     SimpleInterface, Directory
 )
 from niworkflows.data import getters
-from niworkflows.nipype.utils.filemanip import split_filename
+from nipype.utils.filemanip import split_filename
 
 # CITFI structures with corresponding FS labels
 CIFTI_STRUCT_WITH_LABELS = {

fmriprep/interfaces/confounds.py

@@ -13,9 +13,9 @@
 import shutil
 import numpy as np
 import pandas as pd
-from niworkflows.nipype import logging
-from niworkflows.nipype.utils.filemanip import fname_presuffix
-from niworkflows.nipype.interfaces.base import (
+from nipype import logging
+from nipype.utils.filemanip import fname_presuffix
+from nipype.interfaces.base import (
     traits, TraitedSpec, BaseInterfaceInputSpec, File, Directory, isdefined,
     SimpleInterface
 )

fmriprep/interfaces/fmap.py

@@ -17,9 +17,9 @@
 
 import numpy as np
 import nibabel as nb
-from niworkflows.nipype import logging
-from niworkflows.nipype.utils.filemanip import fname_presuffix
-from niworkflows.nipype.interfaces.base import (
+from nipype import logging
+from nipype.utils.filemanip import fname_presuffix
+from nipype.interfaces.base import (
     BaseInterfaceInputSpec, TraitedSpec, File, isdefined, traits,
     SimpleInterface)
 
@@ -241,7 +241,7 @@ def _despike2d(data, thres, neigh=None):
 
 def _unwrap(fmap_data, mag_file, mask=None):
     from math import pi
-    from niworkflows.nipype.interfaces.fsl import PRELUDE
+    from nipype.interfaces.fsl import PRELUDE
     magnii = nb.load(mag_file)
 
     if mask is None:
@@ -433,7 +433,7 @@ def _torads(in_file, fmap_range=None, newpath=None):
     """
     from math import pi
     import nibabel as nb
-    from niworkflows.nipype.utils.filemanip import fname_presuffix
+    from nipype.utils.filemanip import fname_presuffix
 
     out_file = fname_presuffix(in_file, suffix='_rad', newpath=newpath)
     fmapnii = nb.load(in_file)
@@ -452,7 +452,7 @@ def _tohz(in_file, range_hz, newpath=None):
     """Convert a field map to Hz units"""
     from math import pi
     import nibabel as nb
-    from niworkflows.nipype.utils.filemanip import fname_presuffix
+    from nipype.utils.filemanip import fname_presuffix
 
     out_file = fname_presuffix(in_file, suffix='_hz', newpath=newpath)
     fmapnii = nb.load(in_file)
@@ -485,7 +485,7 @@ def phdiff2fmap(in_file, delta_te, newpath=None):
     import math
     import numpy as np
     import nibabel as nb
-    from niworkflows.nipype.utils.filemanip import fname_presuffix
+    from nipype.utils.filemanip import fname_presuffix
     #  GYROMAG_RATIO_H_PROTON_MHZ = 42.576
 
     out_file = fname_presuffix(in_file, suffix='_fmap', newpath=newpath)

fmriprep/interfaces/freesurfer.py

@@ -15,8 +15,8 @@
 
 Disable warnings:
 
-    >>> import niworkflows.nipype as nn
-    >>> nn.logging.getLogger('interface').setLevel('ERROR')
+    >>> from nipype import logging
+    >>> logging.getLogger('interface').setLevel('ERROR')
 
 """
 
@@ -28,13 +28,13 @@
 from scipy.ndimage.morphology import binary_fill_holes
 from nilearn.image import resample_to_img, new_img_like
 
-from niworkflows.nipype.utils.filemanip import copyfile, filename_to_list, fname_presuffix
-from niworkflows.nipype.interfaces.base import (
+from nipype.utils.filemanip import copyfile, filename_to_list, fname_presuffix
+from nipype.interfaces.base import (
     isdefined, InputMultiPath, BaseInterfaceInputSpec, TraitedSpec, File, traits, Directory
 )
-from niworkflows.nipype.interfaces import freesurfer as fs
-from niworkflows.nipype.interfaces.base import SimpleInterface
-from niworkflows.nipype.interfaces.freesurfer.preprocess import ConcatenateLTA
+from nipype.interfaces import freesurfer as fs
+from nipype.interfaces.base import SimpleInterface
+from nipype.interfaces.freesurfer.preprocess import ConcatenateLTA
 
 
 class StructuralReference(fs.RobustTemplate):