Skip to content

RF: Redirect nipype.workflows to niflow.nipype1.workflows #3067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/generate_dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ function generate_main_dockerfile() {
--miniconda create_env=neuro \
conda_install='python=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
libxml2 libxslt matplotlib mkl "numpy!=1.16.0" paramiko
pandas psutil scikit-learn scipy traits' \
pip_install="pytest-xdist" \
pandas psutil scikit-learn scipy traits rdflib' \
pip_install="pytest-xdist niflow-nipype1-workflows" \
activate=true \
--copy docker/files/run_builddocs.sh docker/files/run_examples.sh \
docker/files/run_pytests.sh nipype/external/fsl_imglob.py /usr/bin/ \
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/fsl/dti.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ class BEDPOSTX5(FSLXCommand):


.. note:: Consider using
:func:`nipype.workflows.fsl.dmri.create_bedpostx_pipeline` instead.
:func:`niflow.nipype1.workflows.fsl.dmri.create_bedpostx_pipeline` instead.


Example
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/fsl/epi.py
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ class EPIDeWarp(FSLCommand):
<http://surfer.nmr.mgh.harvard.edu/fswiki/epidewarp.fsl>`_.

.. warning:: deprecated in FSL, please use
:func:`nipype.workflows.dmri.preprocess.epi.sdc_fmb` instead.
:func:`niflow.nipype1.workflows.dmri.preprocess.epi.sdc_fmb` instead.

Examples
--------
Expand Down
23 changes: 22 additions & 1 deletion nipype/interfaces/mrtrix/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,34 @@

from ... import logging
from ...utils.filemanip import split_filename
from ...workflows.misc.utils import get_data_dims, get_vox_dims
from ..base import TraitedSpec, File, isdefined
from ..dipy.base import DipyBaseInterface, HAVE_DIPY as have_dipy

iflogger = logging.getLogger('nipype.interface')


def get_vox_dims(volume):
import nibabel as nb
from nipype.utils import NUMPY_MMAP
if isinstance(volume, list):
volume = volume[0]
nii = nb.load(volume, mmap=NUMPY_MMAP)
hdr = nii.header
voxdims = hdr.get_zooms()
return [float(voxdims[0]), float(voxdims[1]), float(voxdims[2])]


def get_data_dims(volume):
import nibabel as nb
from nipype.utils import NUMPY_MMAP
if isinstance(volume, list):
volume = volume[0]
nii = nb.load(volume, mmap=NUMPY_MMAP)
hdr = nii.header
datadims = hdr.get_data_shape()
return [int(datadims[0]), int(datadims[1]), int(datadims[2])]


def transform_to_affine(streams, header, affine):
from dipy.tracking.utils import move_streamlines
rotation, scale = np.linalg.qr(affine)
Expand Down
22 changes: 22 additions & 0 deletions nipype/workflows/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# -*- coding: utf-8 -*-
# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
# vi: set ft=python sts=4 ts=4 sw=4 et:

_msg = ["Nipype 1 workflows have been moved to the niflow-nipype1-workflows package."]
try:
from niflow.nipype1.workflows import data, dmri, fmri, misc, rsfmri, smri
except ImportError:
_msg.append("pip install niflow-nipype1-workflows to continue using them.")
else:
import sys
# Hack to make `from nipype.workflows.X import Y` work
sys.modules['nipype.workflows.data'] = data
sys.modules['nipype.workflows.dmri'] = dmri
sys.modules['nipype.workflows.fmri'] = fmri
sys.modules['nipype.workflows.misc'] = misc
sys.modules['nipype.workflows.rsfmri'] = rsfmri
sys.modules['nipype.workflows.smri'] = smri
_msg.append("nipype.workflows.* provides a reference for backwards compatibility. "
"Please use niflow.nipype1.workflows.* to avoid this warning.")
del sys

import warnings
warnings.warn(' '.join(_msg))
del warnings, _msg
17 changes: 0 additions & 17 deletions nipype/workflows/data/__init__.py

This file was deleted.

67 changes: 0 additions & 67 deletions nipype/workflows/data/ecc.sch

This file was deleted.

64 changes: 0 additions & 64 deletions nipype/workflows/data/hmc.sch

This file was deleted.

4 changes: 0 additions & 4 deletions nipype/workflows/dmri/__init__.py

This file was deleted.

5 changes: 0 additions & 5 deletions nipype/workflows/dmri/camino/__init__.py

This file was deleted.

Loading