Skip to content

convert modelchain.ipynb to rst, remove nbsphinx #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 9, 2018
Merged

convert modelchain.ipynb to rst, remove nbsphinx #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8a0e794
convert modelchain.ipynb to rst, remove nbsphinx
wholmgren Sep 7, 2018
799aa4e
some clean up
wholmgren Sep 8, 2018
26a5051
remove ipywidgets and docutils from doc env
wholmgren Sep 9, 2018
b27f733
remove outdated section
wholmgren Sep 9, 2018
fa5ba86
hacks to make other pages compile
wholmgren Sep 9, 2018
34da738
other doc clean up
wholmgren Sep 9, 2018
6ff6b8f
3 spaces for directive options
wholmgren Sep 9, 2018
37584a7
use bare .. ipython:: (no python)
wholmgren Sep 9, 2018
af7cdff
enabled install option on rtd. now removing previously added output
wholmgren Sep 9, 2018
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
3 changes: 0 additions & 3 deletions docs/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ dependencies:
- ephem
- numba
- ipython=6.3
- ipywidgets
- numpydoc
- matplotlib=2.2.2
- siphon=0.7.0
- sphinx=1.7.2
- netCDF4=1.3.1
- hdf4=4.2.12
- sphinx_rtd_theme
- docutils
- nbsphinx
5 changes: 2 additions & 3 deletions docs/sphinx/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ def __getattr__(cls, name):
'numpydoc',
'sphinx.ext.autosummary',
'IPython.sphinxext.ipython_directive',
'IPython.sphinxext.ipython_console_highlighting',
'nbsphinx'
'IPython.sphinxext.ipython_console_highlighting'
]

# Add any paths that contain templates here, relative to this directory.
Expand Down Expand Up @@ -312,7 +311,7 @@ def setup(app):

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'python': ('https://docs.python.org/3.5/', None),
'python': ('https://docs.python.org/3.7/', None),
'pandas': ('http://pandas.pydata.org/pandas-docs/stable/', None),
'numpy': ('http://docs.scipy.org/doc/numpy/', None),
}
Expand Down
Loading