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
Apply suggestions from code review
Co-Authored-By: Chris Markiewicz <[email protected]>
  • Loading branch information
oesteban and effigies committed Jan 6, 2020
commit 8b5dab18fea4f70daf7c87d9c3159ad926e41daa
10 changes: 5 additions & 5 deletions examples/fmri_spm_auditory.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def get_vox_dims(volume):
l1analysis = pe.Workflow(name='analysis')

"""Generate SPM-specific design information using
:ref:`nipype.algorithms.modelgen.SpecifyModel`.
:ref:`nipype.algorithms.modelgen.SpecifySPMModel`.
"""

modelspec = pe.Node(interface=model.SpecifySPMModel(), name="modelspec")
Expand Down Expand Up @@ -273,7 +273,7 @@ def makelist(item):
-----------------------------------------
Here we create a structure that provides information
about the experimental paradigm. This is used by the
:ref:`nipype.algorithms.modelgen.SpecifyModel`
:ref:`nipype.algorithms.modelgen.SpecifySPMModel`
to create the information necessary to generate an SPM design matrix.
"""

Expand Down Expand Up @@ -327,7 +327,7 @@ def makelist(item):
pipeline. Thus for this pipeline there will be subject specific
sub-directories.

The :func:`nipype.pipeline.engine.Workflow.connect` function creates the
The :func:`~nipype.pipeline.engine.workflows.Workflow.connect` method creates the
links between the processes, i.e., how data should flow in and out of
the processing nodes.
"""
Expand Down Expand Up @@ -391,8 +391,8 @@ def getstripdir(subject_id):
The code discussed above sets up all the necessary data structures
with appropriate parameters and the connectivity between the
processes, but does not generate any output. To actually run the
analysis on the data the :func:`nipype.pipeline.engine.workflows.Workflow.run`
function needs to be called.
analysis on the data the :func:`~nipype.pipeline.engine.workflows.Workflow.run`
method needs to be called.
"""

if __name__ == '__main__':
Expand Down
4 changes: 2 additions & 2 deletions nipype/algorithms/confounds.py
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,10 @@ def _run_interface(self, runtime):
else:
components_criterion = 6
IFLOGGER.warning(
"``num_components`` and ``variance_threshold`` are "
"`num_components` and `variance_threshold` are "
"not defined. Setting number of components to 6 "
"for backward compatibility. Please set either "
"``num_components`` or ``variance_threshold``, as "
"`num_components` or `variance_threshold`, as "
"this feature may be deprecated in the future."
)

Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/afni/preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -3145,7 +3145,7 @@ class TSmoothInputSpec(AFNICommandInputSpec):
argstr="-osf",
)
lin3 = traits.Int(
desc=r"3 point linear filter: :math:`0.5\,(1-m)\,a + m\,b + 0.5\,(1-m)\,c"
desc=r"3 point linear filter: :math:`0.5\,(1-m)\,a + m\,b + 0.5\,(1-m)\,c`"
"Here, 'm' is a number strictly between 0 and 1.",
argstr="-3lin %d",
)
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/base/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class BaseInterface(Interface):
----------
input_spec: :obj:`nipype.interfaces.base.specs.TraitedSpec`
points to the traited class for the inputs
output_spec: HasTraits
output_spec: :obj:`nipype.interfaces.base.specs.TraitedSpec`
points to the traited class for the outputs
_redirect_x: bool
should be set to ``True`` when the interface requires
Expand Down
4 changes: 2 additions & 2 deletions nipype/interfaces/cmtk/cmtk.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ def create_endpoints_array(fib, voxelSize):
Returns
-------
endpoints : ndarray of size [#fibers, 2, 3]
containing for each fiber the ndex of its first and last point in the voxelSize volume
containing for each fiber the index of its first and last point in the voxelSize volume
endpointsmm : ndarray of size [#fibers, 2, 3]
endpoints in milimeter coordinates
endpoints in millimeter coordinates

"""
# Init
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/nilearn.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- 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:
"""Nilearn is a Python module for fast and easy statistical learning on NeuroImaging data."""
"""Nilearn is a Python library for fast and easy statistical learning on NeuroImaging data."""
import os

import numpy as np
Expand Down