Skip to content

Commit 8c180b1

Browse files
committed
many bugfixes for documentation
1 parent 06b0403 commit 8c180b1

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ script:
2626
- "./docs/update_apidocs.sh"
2727
- mkdir data
2828
- which nosetests
29-
- nosetests --with-coverage --cover-inclusive --cover-package=core,implementation,helpers,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage pySDC/
29+
- nosetests --with-coverage --cover-erase --cover-inclusive --cover-package=pySDC/core,pySDC/implementations,pySDC/helpers,pySDC/tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage pySDC/tests
3030
- if [[ $PYTHON_VERSION == 3 ]]; then travis-sphinx build; fi
3131

3232
after_success:

docs/source/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
sys.path.insert(0, os.path.abspath('../'))
2323
sys.path.insert(0, os.path.abspath('../../'))
2424
sys.path.insert(0, os.path.abspath('../../../'))
25+
sys.path.insert(0, os.path.abspath('../../pySDC'))
2526

2627
# -- General configuration ------------------------------------------------
2728

docs/source/index.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ Tutorial
5555
.. toctree::
5656
:maxdepth: 1
5757

58-
pySDC/tutorial/step_1.rst
59-
pySDC/tutorial/step_2.rst
60-
pySDC/tutorial/step_3.rst
61-
pySDC/tutorial/step_4.rst
62-
pySDC/tutorial/step_5.rst
63-
pySDC/tutorial/step_6.rst
64-
pySDC/tutorial/step_7.rst
58+
tutorial/step_1.rst
59+
tutorial/step_2.rst
60+
tutorial/step_3.rst
61+
tutorial/step_4.rst
62+
tutorial/step_5.rst
63+
tutorial/step_6.rst
64+
tutorial/step_7.rst
6565

6666
Playgrounds
6767
-----------
@@ -75,11 +75,11 @@ Projects
7575
.. toctree::
7676
:maxdepth: 2
7777

78-
pySDC/projects/parallelSDC.rst
79-
pySDC/projects/node_failure.rst
80-
pySDC/projects/fwsw.rst
81-
pySDC/projects/asymp_conv.rst
82-
pySDC/projects/RDC.rst
78+
projects/parallelSDC.rst
79+
projects/node_failure.rst
80+
projects/fwsw.rst
81+
projects/asymp_conv.rst
82+
projects/RDC.rst
8383

8484
Tests
8585
-----
@@ -95,9 +95,9 @@ API documentation
9595
.. toctree::
9696
:maxdepth: 1
9797

98-
pySDC/pySDC.core.rst
99-
pySDC/pySDC.implementations.rst
100-
pySDC/pySDC.helpers.rst
98+
pySDC/core.rst
99+
pySDC/implementations.rst
100+
pySDC/helpers.rst
101101

102102

103103
Indices and tables

docs/update_apidocs.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ rm -r ${PWD}/target/doc/build
2121

2222
echo ""
2323
echo "generating new .rst files ..."
24-
${SPHINX_APIDOC} -o docs/source/pySDC/core pySDC/core --force -M -T
25-
${SPHINX_APIDOC} -o docs/source/pySDC/implementations pySDC/implementations --force -M -T
26-
${SPHINX_APIDOC} -o docs/source/pySDC/helpers pySDC/helpers --force -M -T
27-
#${SPHINX_APIDOC} -o docs/source/pySDC pySDC --force -M -T
24+
${SPHINX_APIDOC} -o docs/source/pySDC pySDC/core --force -T
25+
${SPHINX_APIDOC} -o docs/source/pySDC pySDC/implementations --force -T
26+
${SPHINX_APIDOC} -o docs/source/pySDC pySDC/helpers --force -T
2827
rm docs/source/pySDC/pySDC.rst

pySDC/README_API.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The API (as well as the tutorial pages) can also be generated manually and local
44
.. code-block:: none
55
66
> ./docs/update_apidocs.sh
7-
> nosetests -v --with-id --with-coverage --cover-inclusive --cover-package=core,implementations,helpers,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage pySDC/
7+
> nosetests -v --with-id --with-coverage --cover-inclusive --cover-package=core,implementations,helpers,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage pySDC/tests
88
> travis-sphinx build
99
1010
in the root directory. Then, the main index can be found in ``target/doc/build/index.html``. Anyway, here is the online version:

0 commit comments

Comments
 (0)