Skip to content

Commit a3a9978

Browse files
authored
Merge pull request #39 from effigies/mnt/pin_niflows
MNT: Use niflow-nipype1-workflows for old nipype.workflows imports
2 parents fe6a7a8 + 87dd537 commit a3a9978

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

sdcflows/workflows/fmap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from nipype.pipeline import engine as pe
2222
from nipype.interfaces import utility as niu, fsl, ants
23-
from nipype.workflows.dmri.fsl.utils import demean_image, cleanup_edge_pipeline
23+
from niflow.nipype1.workflows.dmri.fsl.utils import demean_image, cleanup_edge_pipeline
2424
from niworkflows.engine.workflows import LiterateWorkflow as Workflow
2525
from niworkflows.interfaces.bids import DerivativesDataSink
2626
from niworkflows.interfaces.images import IntraModalMerge

sdcflows/workflows/phdiff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from nipype.interfaces import ants, fsl, utility as niu
2222
from nipype.pipeline import engine as pe
23-
from nipype.workflows.dmri.fsl.utils import siemens2rads, demean_image, \
23+
from niflow.nipype1.workflows.dmri.fsl.utils import siemens2rads, demean_image, \
2424
cleanup_edge_pipeline
2525
from niworkflows.engine.workflows import LiterateWorkflow as Workflow
2626
from niworkflows.interfaces.images import IntraModalMerge
@@ -36,7 +36,7 @@ def init_phdiff_wf(omp_nthreads, name='phdiff_wf'):
3636
Estimates the fieldmap using a phase-difference image and one or more
3737
magnitude images corresponding to two or more :abbr:`GRE (Gradient Echo sequence)`
3838
acquisitions. The `original code was taken from nipype
39-
<https://github.com/nipy/nipype/blob/master/nipype/workflows/dmri/fsl/artifacts.py#L514>`_.
39+
<https://github.com/nipy/nipype/blob/0.12.1/nipype/workflows/dmri/fsl/artifacts.py#L514>`_.
4040
4141
.. workflow ::
4242
:graph2use: orig

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ setup_requires =
2424
setuptools >=40.8
2525
install_requires =
2626
nibabel >=2.2.1
27-
nipype >=1.2.0
27+
nipype >=1.2.0,!=1.2.3
28+
niflow-nipype1-workflows ~=0.0.1
2829
niworkflows ~=0.10
2930
numpy
3031
pybids ~=0.9.2

0 commit comments

Comments
 (0)