Skip to content
Snippets Groups Projects
Commit 29ee217c authored by Pierre Augier's avatar Pierre Augier
Browse files

Use Jupyter for nbconvert.

parent 9b2aaa3e
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,6 @@
*Framework for studying fluid dynamics by numerical simulation.*
`Package Documentation <http://fluidsim.readthedocs.org/en/latest/>`__
`Package Documentation <http://fluidsim.readthedocs.org>`__
FluidSim is the numerically oriented package of the `FluidDyn project
......@@ -8,6 +8,6 @@
FluidSim is the numerically oriented package of the `FluidDyn project
<http://fluiddyn.readthedocs.org/en/latest/>`__. The project is still in a
<http://fluiddyn.readthedocs.org>`__. The project is still in a
testing stage so it is still pretty unstable and many of its planned
features have not yet been implemented.
......
......@@ -51,7 +51,7 @@
cleanall: clean
rm -rf generated html.zip
html: $(IPYTHON_NOTEBOOKS_RST)
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
......@@ -164,6 +164,3 @@
zip: html
cd _build/html && zip -r html.zip * && mv html.zip ../../.
%.rst: %.ipynb
cd $(IPYNB_DIR) && ipython nbconvert --to rst $(notdir $<)
......@@ -21,6 +21,9 @@
from fluidrtd import mock_modules
mock_modules(['h5py'])
from fluidrtd.ipynb_maker import ipynb_to_rst
ipynb_to_rst()
import fluidsim
......@@ -46,7 +49,6 @@
'sphinx.ext.viewcode', 'sphinx.ext.autosummary',
'numpydoc',
'mathmacro',
'IPython.sphinxext.ipython_directive'
]
# Add any paths that contain templates here, relative to this directory.
......
cython
ipython[notebook]>=3.0.0
jupyter
numpy
matplotlib
scipy
......@@ -3,6 +3,6 @@
numpy
matplotlib
scipy
fluiddyn>=0.0.10a7
fluiddyn>=0.0.11a1
Sphinx>=1.1
numpydoc
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment