Skip to content

Commit

Permalink
doc fixes (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu Scheltienne authored Oct 27, 2023
1 parent 8efe129 commit 5f9cd52
Show file tree
Hide file tree
Showing 20 changed files with 198 additions and 671 deletions.
199 changes: 13 additions & 186 deletions doc/Makefile
Original file line number Diff line number Diff line change
@@ -1,193 +1,20 @@
# Makefile for Sphinx documentation
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS = -nWT --keep-going
SPHINXBUILD = sphinx-build
PAPER =
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif

# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext

# Put it first so that "make" without argument is like "make help".
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files"
@echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " qthelp to make HTML files and a qthelp project"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
@echo " text to make text files"
@echo " man to make manual pages"
@echo " texinfo to make Texinfo files"
@echo " info to make Texinfo files and run them through makeinfo"
@echo " gettext to make PO message catalogs"
@echo " changes to make an overview of all changed/added/deprecated items"
@echo " xml to make Docutils-native XML files"
@echo " pseudoxml to make pseudoxml-XML files for display purposes"
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"

clean:
-rm -rf $(BUILDDIR)/*
-rm -rf generated/*

html_stable:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html_stable
@echo
@echo "Build finished. The HTML pages are in _build/html_stable."

html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

html-noplot:
$(SPHINXBUILD) -D plot_gallery=0 -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."

singlehtml:
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."

pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."

json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."

htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."

qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/project-template.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/project-template.qhc"

devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/project-template"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/project-template"
@echo "# devhelp"

epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."

latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."

latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

latexpdfja:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."

man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."

texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."

info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
make -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."

gettext:
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
@echo
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."

changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."

linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."

doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."

xml:
$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
@echo
@echo "Build finished. The XML files are in $(BUILDDIR)/xml."

pseudoxml:
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
@echo
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

view:
@python -c "import webbrowser; webbrowser.open_new_tab('file://$(PWD)/_build/html/index.html')"
.PHONY: help Makefile

show: view
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
2 changes: 1 addition & 1 deletion doc/_static/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
{
"name": "0.4 (stable)",
"version": "stable",
"version": "0.4",
"url": "https://mne.tools/mne-icalabel/stable"
},
{
Expand Down
20 changes: 0 additions & 20 deletions doc/_templates/docs-navbar.html

This file was deleted.

13 changes: 0 additions & 13 deletions doc/_templates/docs-toc.html

This file was deleted.

19 changes: 0 additions & 19 deletions doc/_templates/layout.html

This file was deleted.

11 changes: 0 additions & 11 deletions doc/_templates/version-switcher.html

This file was deleted.

10 changes: 5 additions & 5 deletions doc/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Most-used functions
.. currentmodule:: mne_icalabel

.. autosummary::
:toctree: generated/
:toctree: ./generated/api

label_components

Expand Down Expand Up @@ -48,7 +48,7 @@ the 3 features are concatenated for the final layer.
.. currentmodule:: mne_icalabel.iclabel

.. autosummary::
:toctree: generated/
:toctree: ./generated/api

iclabel_label_components
get_iclabel_features
Expand All @@ -63,7 +63,7 @@ Contains functions to extract features from `~mne.preprocessing.ICA` instance an
.. currentmodule:: mne_icalabel.features

.. autosummary::
:toctree: generated/
:toctree: ./generated/api

get_topomaps

Expand All @@ -75,7 +75,7 @@ derivative standard of BIDS for EEG data.
.. currentmodule:: mne_icalabel.annotation

.. autosummary::
:toctree: generated/
:toctree: ./generated/api

mark_component
write_components_tsv
Expand All @@ -88,6 +88,6 @@ significant bugs still. Please report these in the GH issues tab.
.. currentmodule:: mne_icalabel

.. autosummary::
:toctree: generated/
:toctree: ./generated/api

gui.label_ica_components
22 changes: 22 additions & 0 deletions doc/changes/0.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.. NOTE: we use cross-references to highlight new functions and classes.
Please follow the examples below, so the changelog page will have a link to
the function/class documentation.
.. NOTE: there are 3 separate sections for changes, based on type:
- "Enhancements" for new features
- "Bugs" for bug fixes
- "API changes" for backward-incompatible changes
.. NOTE: You can use the :pr:`xx` and :issue:`xx` role to x-ref to a GitHub PR
or issue from this project.
.. include:: ./authors.inc

Version 0.3
===========

- Add functions for annotating and labeling ICA components in BIDS format :func:`mne_icalabel.annotation.write_components_tsv`, :func:`mne_icalabel.annotation.mark_component` (:pr:`60` by `Adam Li`_)
- Fix shape of ``'y_pred_proba'`` output from :func:`mne_icalabel.label_components` (:pr:`36` by `Mathieu Scheltienne`_)
- Add a warning if the ICA decomposition provided does not match the expected decomposition by ``ICLabel`` (:pr:`42` by `Mathieu Scheltienne`_)
- Fix extraction of PSD feature from ``ICLabel`` model on epochs by (:pr:`64` by `Mathieu Scheltienne`_)
- Fix ICLabel topographic features on ICA fitted with a channel selection performed by ``picks`` (:pr:`68` by `Mathieu Scheltienne`_)
21 changes: 21 additions & 0 deletions doc/changes/0.3.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.. NOTE: we use cross-references to highlight new functions and classes.
Please follow the examples below, so the changelog page will have a link to
the function/class documentation.
.. NOTE: there are 3 separate sections for changes, based on type:
- "Enhancements" for new features
- "Bugs" for bug fixes
- "API changes" for backward-incompatible changes
.. NOTE: You can use the :pr:`xx` and :issue:`xx` role to x-ref to a GitHub PR
or issue from this project.
.. include:: ./authors.inc

Version 0.3
===========

- Adding an experimental GUI to facilitate the labeling of ICA components (:pr:`66` by `Adam Li`_ and `Mathieu Scheltienne`_)
- Improve test coverage and documentation (:pr:`94` by `Mathieu Scheltienne`_)
- Ignore the ``RuntimeWarning`` issued by the grid inteprolation for ICLabel topographic feature (:pr:`69` by `Mathieu Scheltienne`_)
- Add topographic feature using MNE with `~mne_icalabel.features.get_topomaps` (:pr:`71` by `Anand Saini`_ and `Mathieu Scheltienne`_)
18 changes: 18 additions & 0 deletions doc/changes/0.4.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.. NOTE: we use cross-references to highlight new functions and classes.
Please follow the examples below, so the changelog page will have a link to
the function/class documentation.
.. NOTE: there are 3 separate sections for changes, based on type:
- "Enhancements" for new features
- "Bugs" for bug fixes
- "API changes" for backward-incompatible changes
.. NOTE: You can use the :pr:`xx` and :issue:`xx` role to x-ref to a GitHub PR
or issue from this project.
.. include:: ./authors.inc

Version 0.4
===========

- Add ``strict_label`` keyword argument to :func:`mne_icalabel.annotation.mark_component` to enable users to input labels that are not part of the accepted ICLabel key words (:pr:`101` by `Adam Li`_)
4 changes: 4 additions & 0 deletions doc/changes/authors.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.. _Adam Li: https://github.com/adam2392
.. _Mathieu Scheltienne: https://github.com/mscheltienne
.. _Jacob Feitelberg: https://github.com/jacobf18
.. _Anand Saini: https://github.com/anandsaini024
Loading

0 comments on commit 5f9cd52

Please sign in to comment.