Skip to content

Commit

Permalink
Merge pull request #39 from effigies/mnt/pin_niflows
Browse files Browse the repository at this point in the history
MNT: Use niflow-nipype1-workflows for old nipype.workflows imports
  • Loading branch information
mgxd authored Oct 9, 2019
2 parents fe6a7a8 + 87dd537 commit a3a9978
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion sdcflows/workflows/fmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from nipype.pipeline import engine as pe
from nipype.interfaces import utility as niu, fsl, ants
from nipype.workflows.dmri.fsl.utils import demean_image, cleanup_edge_pipeline
from niflow.nipype1.workflows.dmri.fsl.utils import demean_image, cleanup_edge_pipeline
from niworkflows.engine.workflows import LiterateWorkflow as Workflow
from niworkflows.interfaces.bids import DerivativesDataSink
from niworkflows.interfaces.images import IntraModalMerge
Expand Down
4 changes: 2 additions & 2 deletions sdcflows/workflows/phdiff.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from nipype.interfaces import ants, fsl, utility as niu
from nipype.pipeline import engine as pe
from nipype.workflows.dmri.fsl.utils import siemens2rads, demean_image, \
from niflow.nipype1.workflows.dmri.fsl.utils import siemens2rads, demean_image, \
cleanup_edge_pipeline
from niworkflows.engine.workflows import LiterateWorkflow as Workflow
from niworkflows.interfaces.images import IntraModalMerge
Expand All @@ -36,7 +36,7 @@ def init_phdiff_wf(omp_nthreads, name='phdiff_wf'):
Estimates the fieldmap using a phase-difference image and one or more
magnitude images corresponding to two or more :abbr:`GRE (Gradient Echo sequence)`
acquisitions. The `original code was taken from nipype
<https://github.com/nipy/nipype/blob/master/nipype/workflows/dmri/fsl/artifacts.py#L514>`_.
<https://github.com/nipy/nipype/blob/0.12.1/nipype/workflows/dmri/fsl/artifacts.py#L514>`_.
.. workflow ::
:graph2use: orig
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ setup_requires =
setuptools >=40.8
install_requires =
nibabel >=2.2.1
nipype >=1.2.0
nipype >=1.2.0,!=1.2.3
niflow-nipype1-workflows ~=0.0.1
niworkflows ~=0.10
numpy
pybids ~=0.9.2
Expand Down

0 comments on commit a3a9978

Please sign in to comment.