Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
28b8b8a
DOC: Deduplicate code for Sphinx's APIdoc generation
oesteban Dec 20, 2019
722bd64
DOC: Deep revision of documentation building
oesteban Dec 21, 2019
c68e3b9
fix: last release changelog
oesteban Dec 21, 2019
48f78d0
enh: accept a milestone number in the ``update_changes.sh`` script
oesteban Dec 21, 2019
0ce15de
fix: remove unnecessary line [skip ci]
oesteban Dec 21, 2019
a51b95a
DOC: Documentation overhaul
oesteban Dec 21, 2019
204c0bd
fix: circle.yml file
oesteban Dec 29, 2019
6de90c5
fix: add modified specs
oesteban Dec 30, 2019
f763008
sty: black
oesteban Dec 30, 2019
1e55bc6
fix: make specs after black
oesteban Dec 30, 2019
f5f7314
maint: remove unused ``build_docs.py`` script
oesteban Dec 30, 2019
9967f25
fix: small typos, pep8 errors, etc.
oesteban Dec 30, 2019
45a6bfc
Update .zenodo.json - added Hrvoje Stojic
hstojic Dec 23, 2019
7c90bd8
MNT: Update mailmap
effigies Dec 30, 2019
d7bef76
change ANTS number_of_time_steps from Float to Int
Dec 20, 2019
218a63d
Apply suggestions from code review
oesteban Jan 1, 2020
9224a6f
Apply suggestions from code review
oesteban Jan 1, 2020
be8d9a9
fix: minimal fixes in ordering and links
oesteban Jan 1, 2020
be900d1
fix: links to interface bases when showing inheritance
oesteban Jan 1, 2020
8b5dab1
Apply suggestions from code review
oesteban Jan 1, 2020
46d8f2b
Apply suggestions from code review
oesteban Jan 1, 2020
022dea5
Apply suggestions from code review
oesteban Jan 1, 2020
ff7dd7d
Update doc/interfaces.rst
oesteban Jan 1, 2020
da67d71
fix: typos and links in fmri auditory example
oesteban Jan 1, 2020
5bdaaf2
fix: updates to ``make_examples.py``
oesteban Jan 1, 2020
9f99aaf
fix: miscellaneous improvements and fixes
oesteban Jan 1, 2020
879c556
fix: documentation build at readthedocs
oesteban Jan 1, 2020
3335c1b
doc: fix sphinx's latex build
oesteban Jan 2, 2020
21ecd6a
fix: strings too long
oesteban Jan 2, 2020
9ef8c95
fix: codacy issues
oesteban Jan 2, 2020
3e2e89f
DOC: Bring examples generation back to ``doc/conf.py``
oesteban Jan 2, 2020
d8b89aa
DOC: Revise generation of examples to work in RTD
oesteban Jan 2, 2020
4b8d467
FIX: Repair aftermath of docs refactor
oesteban Jan 2, 2020
d576418
fix: revise some r-strings in SPM's EstimateContrast
oesteban Jan 2, 2020
aaf677a
sty: black
oesteban Jan 2, 2020
3b8f228
FIX: Can't seem to import workflows from niflows in CircleCI
oesteban Jan 2, 2020
5bc2777
fix: update imports nipype.workflows -> niflow.nipyp1.workflows
oesteban Jan 2, 2020
f122323
pin: new niflows version 0.4.0
oesteban Jan 2, 2020
414fa39
fix: mapnode to generate result file when crashes in single node mode
satra Jan 5, 2020
6df7842
enh: simplify test further
satra Jan 5, 2020
4953418
DOC: Update changelog to include backported PRs
effigies Jan 6, 2020
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
Prev Previous commit
Next Next commit
fix: update imports nipype.workflows -> niflow.nipyp1.workflows
  • Loading branch information
oesteban authored and effigies committed Jan 6, 2020
commit 5bc27775e631dc5cc9ca2bd035287e1424dbd6fa
8 changes: 4 additions & 4 deletions examples/dmri_connectivity_advanced.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@
import inspect
import os
import os.path as op # system functions
from nipype.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
from nipype.workflows.dmri.camino.connectivity_mapping import select_aparc_annot
from niflow.nipype1.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
from niflow.nipype1.workflows.dmri.camino.connectivity_mapping import select_aparc_annot
from nipype.utils.misc import package_check
import warnings
from nipype.workflows.dmri.connectivity.nx import create_networkx_pipeline, create_cmats_to_csv_pipeline
from nipype.workflows.smri.freesurfer import create_tessellation_flow
from niflow.nipype1.workflows.dmri.connectivity.nx import create_networkx_pipeline, create_cmats_to_csv_pipeline
from niflow.nipype1.workflows.smri.freesurfer import create_tessellation_flow

try:
package_check('cmp')
Expand Down
2 changes: 1 addition & 1 deletion examples/dmri_dtk_dti.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import nipype.interfaces.utility as util # utility
import nipype.pipeline.engine as pe # pypeline engine
import os # system functions
from nipype.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
from niflow.nipype1.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
"""
Confirm package dependencies are installed. (This is only for the
tutorial, rarely would you put this in your own code.)
Expand Down
2 changes: 1 addition & 1 deletion examples/dmri_dtk_odf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import nipype.interfaces.utility as util # utility
import nipype.pipeline.engine as pe # pypeline engine
import os # system functions
from nipype.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
from niflow.nipype1.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
"""
Confirm package dependencies are installed. (This is only for the
tutorial, rarely would you put this in your own code.)
Expand Down
2 changes: 1 addition & 1 deletion examples/dmri_fsl_dti.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import nipype.interfaces.utility as util # utility
import nipype.pipeline.engine as pe # pypeline engine
import os # system functions
from nipype.workflows.dmri.fsl.dti import create_eddy_correct_pipeline,\
from niflow.nipype1.workflows.dmri.fsl.dti import create_eddy_correct_pipeline,\
create_bedpostx_pipeline
"""
Confirm package dependencies are installed. (This is only for the
Expand Down
4 changes: 2 additions & 2 deletions examples/dmri_group_connectivity_camino.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
import nipype.interfaces.freesurfer as fs # freesurfer
import os.path as op # system functions
import cmp
from nipype.workflows.dmri.camino.group_connectivity import create_group_connectivity_pipeline
from nipype.workflows.dmri.connectivity.group_connectivity import (
from niflow.nipype1.workflows.dmri.camino.group_connectivity import create_group_connectivity_pipeline
from niflow.nipype1.workflows.dmri.connectivity.group_connectivity import (
create_merge_networks_by_group_workflow,
create_merge_group_networks_workflow,
create_average_networks_by_group_workflow)
Expand Down
4 changes: 2 additions & 2 deletions examples/dmri_group_connectivity_mrtrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
import nipype.interfaces.freesurfer as fs # freesurfer
import os.path as op # system functions
import cmp
from nipype.workflows.dmri.mrtrix.group_connectivity import create_group_connectivity_pipeline
from nipype.workflows.dmri.connectivity.group_connectivity import (
from niflow.nipype1.workflows.dmri.mrtrix.group_connectivity import create_group_connectivity_pipeline
from niflow.nipype1.workflows.dmri.connectivity.group_connectivity import (
create_merge_network_results_by_group_workflow,
create_merge_group_network_results_workflow,
create_average_networks_by_group_workflow)
Expand Down
4 changes: 2 additions & 2 deletions examples/dmri_preprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
from nipype.interfaces import ants
"""
Load specific nipype's workflows for preprocessing of dMRI data:
:class:`nipype.workflows.dmri.preprocess.epi.all_peb_pipeline`,
:class:`niflow.nipype1.workflows.dmri.preprocess.epi.all_peb_pipeline`,
as data include a *b0* volume with reverse encoding direction
(*P>>>A*, or *y*), in contrast with the general acquisition encoding
that is *A>>>P* or *-y* (in RAS systems).
"""

from nipype.workflows.dmri.fsl.artifacts import all_fsl_pipeline, remove_bias
from niflow.nipype1.workflows.dmri.fsl.artifacts import all_fsl_pipeline, remove_bias
"""
Map field names into individual subject runs
"""
Expand Down
4 changes: 2 additions & 2 deletions examples/dmri_tbss_nki.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

"""

from nipype.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
from nipype.workflows.dmri.fsl.tbss import create_tbss_non_FA, create_tbss_all
from niflow.nipype1.workflows.dmri.fsl.dti import create_eddy_correct_pipeline
from niflow.nipype1.workflows.dmri.fsl.tbss import create_tbss_non_FA, create_tbss_all
"""
Tell python where to find the appropriate functions.
"""
Expand Down
2 changes: 1 addition & 1 deletion examples/fmri_ants_openfmri.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from nipype.interfaces.io import FreeSurferSource
import nipype.interfaces.utility as niu
from nipype.interfaces.utility import Merge, IdentityInterface
from nipype.workflows.fmri.fsl import (create_featreg_preproc,
from niflow.nipype1.workflows.fmri.fsl import (create_featreg_preproc,
create_modelfit_workflow,
create_fixed_effects_flow)
from nipype.utils import NUMPY_MMAP
Expand Down
2 changes: 1 addition & 1 deletion examples/fmri_fsl_feeds.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from nipype.interfaces import fsl # fsl
from nipype.pipeline import engine as pe # pypeline engine
from nipype.algorithms import modelgen as model # model generation
from nipype.workflows.fmri.fsl import (
from niflow.nipype1.workflows.fmri.fsl import (
create_featreg_preproc, create_modelfit_workflow, create_reg_workflow)
from nipype.interfaces.base import Bunch
"""
Expand Down
2 changes: 1 addition & 1 deletion examples/fmri_fsl_reuse.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import nipype.algorithms.modelgen as model # model generation
import nipype.algorithms.rapidart as ra # artifact detection

from nipype.workflows.fmri.fsl import (create_featreg_preproc,
from niflow.nipype1.workflows.fmri.fsl import (create_featreg_preproc,
create_modelfit_workflow,
create_fixed_effects_flow)
"""
Expand Down
2 changes: 1 addition & 1 deletion examples/fmri_spm_dartel.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import nipype.interfaces.io as nio # Data i/o
import nipype.interfaces.spm as spm # spm
import nipype.workflows.fmri.spm as spm_wf # spm
import niflow.nipype1.workflows.fmri.spm as spm_wf # spm
import nipype.interfaces.fsl as fsl # fsl
from nipype.interfaces import utility as niu # Utilities
import nipype.pipeline.engine as pe # pypeline engine
Expand Down
2 changes: 1 addition & 1 deletion examples/frontiers_paper/smoothing_comparison.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import nipype.interfaces.utility as util
import nipype.pipeline.engine as pe # pypeline engine
import nipype.algorithms.modelgen as model # model specification
import nipype.workflows.fmri.fsl as fsl_wf
import niflow.nipype1.workflows.fmri.fsl as fsl_wf
from nipype.interfaces.base import Bunch
import os # system functions

Expand Down
2 changes: 1 addition & 1 deletion examples/nipype_tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@
"cell_type": "code",
"collapsed": false,
"input": [
"from nipype.workflows.fmri.fsl.preprocess import create_susan_smooth\n",
"from niflow.nipype1.workflows.fmri.fsl.preprocess import create_susan_smooth\n",
"\n",
"smooth = create_susan_smooth()\n",
"smooth.inputs.inputnode.in_files = opap('output/realigned/_subject_id_sub044/rbold_out.nii')\n",
Expand Down
2 changes: 1 addition & 1 deletion examples/smri_ants_build_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import nipype.interfaces.io as io
import nipype.pipeline.engine as pe # pypeline engine

from nipype.workflows.smri.ants import ANTSTemplateBuildSingleIterationWF
from niflow.nipype1.workflows.smri.ants import ANTSTemplateBuildSingleIterationWF
"""
2. Download T1 volumes into home directory
"""
Expand Down
2 changes: 1 addition & 1 deletion examples/smri_antsregistration_build_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import nipype.interfaces.io as io
import nipype.pipeline.engine as pe # pypeline engine

from nipype.workflows.smri.ants import antsRegistrationTemplateBuildSingleIterationWF
from niflow.nipype1.workflows.smri.ants import antsRegistrationTemplateBuildSingleIterationWF
"""
2. Download T1 volumes into home directory
"""
Expand Down
2 changes: 1 addition & 1 deletion examples/smri_fsreconall.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import nipype.pipeline.engine as pe
import nipype.interfaces.io as nio
from nipype.workflows.smri.freesurfer import create_reconall_workflow
from niflow.nipype1.workflows.smri.freesurfer import create_reconall_workflow
from nipype.interfaces.freesurfer.utils import MakeAverageSubject
from nipype.interfaces.utility import IdentityInterface
"""
Expand Down
4 changes: 2 additions & 2 deletions examples/tessellation_tutorial.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Introduction
============

This script, tessellation_tutorial.py, demonstrates the use of create_tessellation_flow from nipype.workflows.smri.freesurfer, and it can be run with::
This script, tessellation_tutorial.py, demonstrates the use of create_tessellation_flow from niflow.nipype1.workflows.smri.freesurfer, and it can be run with::

python tessellation_tutorial.py

Expand Down Expand Up @@ -39,7 +39,7 @@
import nipype.interfaces.io as nio # Data i/o
import os
import os.path as op
from nipype.workflows.smri.freesurfer import create_tessellation_flow
from niflow.nipype1.workflows.smri.freesurfer import create_tessellation_flow
"""
Directories
===========
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 @@ -1418,7 +1418,7 @@ def __init__(self, **inputs):
warnings.warn(
(
"Deprecated: Please use "
"nipype.workflows.dmri.preprocess.epi.sdc_fmb instead"
"niflow.nipype1.workflows.dmri.preprocess.epi.sdc_fmb instead"
),
DeprecationWarning,
)
Expand Down
4 changes: 2 additions & 2 deletions nipype/sphinxext/plot_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
:graph2use: flat
:simple_form: no

from nipype.workflows.dmri.camino.connectivity_mapping import create_connectivity_pipeline
from niflow.nipype1.workflows.dmri.camino.connectivity_mapping import create_connectivity_pipeline
wf = create_connectivity_pipeline()


Expand All @@ -32,7 +32,7 @@
:graph2use: flat
:simple_form: no

from nipype.workflows.dmri.camino.connectivity_mapping import create_connectivity_pipeline
from niflow.nipype1.workflows.dmri.camino.connectivity_mapping import create_connectivity_pipeline
wf = create_connectivity_pipeline()


Expand Down