-
Notifications
You must be signed in to change notification settings - Fork 530
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Building on top of #3119 and #3129, this PR makes a deep revision of the documentation: * Added a new ``build_docs`` job to CircleCI to test how it renders. * Minimized external machinery (under ``/tools/``) when building the documentation: 1. Some minimal modifications to sphinx extensions (apidoc, napoleon) allow the generation of special documentation for nipype interfaces, as it used to be before this PR 2. A new sphinx extension (``nipype.sphinxext.apidoc``) takes care of parsing and rendering inputs and outputs. They now look like the parameters/arguments of functions when formatted with numpydoc. * Revised the description of many interfaces and the documentation of the main class and the input/output specs. * Revised the structure of the navbar, separating out User-Guide/Examples, Interfaces-Index, and Devs' documentation. * Minimized the number of WARNINGS at documentation build to 5 (4 of them coming out from the auto-generated SEM tools).
- Loading branch information
Showing
113 changed files
with
3,126 additions
and
3,654 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,12 +11,11 @@ PAPEROPT_a4 = -D latex_paper_size=a4 | |
PAPEROPT_letter = -D latex_paper_size=letter | ||
ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . | ||
|
||
.PHONY: help clean html nipypeapi htmlonly latex changes linkcheck doctest | ||
.PHONY: help clean html htmlonly latex changes linkcheck doctest | ||
|
||
help: | ||
@echo "Please use \`make <target>' where <target> is one of" | ||
@echo " html make the HTML documentation" | ||
@echo " nipypeapi make interface API documents only" | ||
@echo " latex make the LaTeX, you can set PAPER=a4 or PAPER=letter" | ||
@echo " pdf make <latex> and run the PDF generation" | ||
@echo " changes make an overview of all changed/added/deprecated" \ | ||
|
@@ -33,20 +32,15 @@ htmlonly: | |
@echo | ||
@echo "Build finished. The HTML pages are in _build/html." | ||
|
||
nipypeapi: | ||
rm -rf interfaces/generated | ||
python -u ../tools/build_interface_docs.py | ||
@echo "Build API docs finished." | ||
|
||
html: clean examples2rst nipypeapi htmlonly | ||
html: clean examples2rst htmlonly | ||
@echo "Build HTML and API finished." | ||
|
||
examples2rst: | ||
examples2rst: clean | ||
mkdir -p users/examples | ||
../tools/make_examples.py --no-exec | ||
../tools/make_examples.py -x ../../../examples/test_spm.py --no-exec | ||
@echo "examples2rst finished." | ||
|
||
latex: nipypeapi | ||
latex: clean | ||
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex | ||
@echo | ||
@echo "Build finished; the LaTeX files are in _build/latex." | ||
|
@@ -80,18 +74,3 @@ gitwash-update: | |
--project-url=http://nipy.org/nipype \ | ||
--project-ml-url=http://mail.scipy.org/mailman/listinfo/nipy-devel | ||
@echo "gitwash updated" | ||
|
||
# Sourceforge doesn't appear to have a way of copying the files | ||
# without specifying a username. So we'll probably have one target | ||
# for each project admin | ||
sf_satra_nightly: html | ||
@echo "Copying html files to sourceforge..." | ||
scp -r _build/html/* satra,[email protected]:htdocs/nipype-nightly/ | ||
|
||
sf_satra: html | ||
@echo "Copying html files to sourceforge..." | ||
rsync -auv _build/html/. satra,[email protected]:htdocs/nipype/. | ||
|
||
sf_filo: html | ||
@echo "Copying html files to sourceforge..." | ||
rsync -auv _build/html/. gorgolewski,[email protected]:htdocs/nipype/. |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
:orphan: | ||
|
||
.. _about: | ||
|
||
===== | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
:orphan: | ||
:tocdepth: 2 | ||
|
||
.. _changes: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
:orphan: | ||
|
||
.. _developers: | ||
|
||
================== | ||
Developer's Corner | ||
================== | ||
|
||
.. toctree:: | ||
:maxdepth: 2 | ||
|
||
devel/index | ||
|
||
.. toctree:: | ||
:maxdepth: 3 | ||
|
||
api/generated/nipype |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
:orphan: | ||
|
||
.. _examples: | ||
|
||
======================= | ||
User Guide and Examples | ||
======================= | ||
|
||
.. admonition:: Michael Notter's User Guide | ||
|
||
Be sure to read `Michael's excellent tutorials <https://miykael.github.io/nipype_tutorial/>`__. | ||
|
||
Examples | ||
~~~~~~~~ | ||
.. toctree:: | ||
:maxdepth: 1 | ||
:glob: | ||
|
||
users/examples/* |
Oops, something went wrong.