Skip to content

Commit bb931c0

Browse files
authored
Merge pull request #89 from kthyng/docs
updated docs and associated items
2 parents 5fe11e6 + 880ec0b commit bb931c0

File tree

11 files changed

+11607
-1181
lines changed

11 files changed

+11607
-1181
lines changed

docs/conf.py

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# |version| and |release|, also used in various other places throughout the
1919
# built documents.
2020
# see https://pypi.org/project/setuptools-scm/ for details
21-
from pkg_resources import get_distribution
21+
from importlib.metadata import version as imversion
2222

2323

2424
print("python exec:", sys.executable)
@@ -32,10 +32,10 @@
3232
# -- Project information -----------------------------------------------------
3333

3434
project = "extract_model"
35-
copyright = "2022, Kristen Thyng"
35+
copyright = "2022-2023, Kristen Thyng"
3636
author = "Kristen Thyng"
3737

38-
release = get_distribution("extract_model").version
38+
release = imversion("extract_model")
3939
# for example take major/minor
4040
version = ".".join(release.split(".")[:2])
4141

@@ -85,13 +85,22 @@
8585
# "xoak",
8686
# ]
8787

88+
# https://myst-nb.readthedocs.io/en/v0.9.0/use/execute.html
89+
jupyter_execute_notebooks = "off"
90+
8891
# Add any paths that contain templates here, relative to this directory.
8992
templates_path = ["_templates"]
9093

9194
# List of patterns, relative to source directory, that match files and
9295
# directories to ignore when looking for source files.
9396
# This pattern also affects html_static_path and html_extra_path.
94-
exclude_patterns = ["_build", "**.ipynb_checkpoints", "Thumbs.db", ".DS_Store"]
97+
exclude_patterns = [
98+
"_build",
99+
"**.ipynb_checkpoints",
100+
"Thumbs.db",
101+
".DS_Store",
102+
"_old_docs",
103+
]
95104

96105

97106
# -- Options for HTML output -------------------------------------------------
@@ -109,6 +118,11 @@
109118
# so a file named "default.css" will overwrite the builtin "default.css".
110119
html_static_path = ["_static"]
111120

121+
# https://myst-nb.readthedocs.io/en/v0.13.0/use/execute.html#execution-timeout
122+
# had this message:
123+
# WARNING: 'execution_timeout' is deprecated for 'nb_execution_timeout' [mystnb.config]
124+
# WARNING: 'execution_allow_errors' is deprecated for 'nb_execution_allow_errors' [mystnb.config]
125+
nb_execution_timeout = 180 # seconds.
112126

113127
# -- nbsphinx specific options ----------------------------------------------
114128
# this allows notebooks to be run even if they produce errors.

docs/environment.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ dependencies:
88
- cf_xarray
99
- cmocean
1010
- dask <=2022.05.0 # for xESMF, https://github.com/axiom-data-science/extract_model/issues/49
11-
- extract_model
12-
- matplotlib
11+
- matplotlib-base
1312
- netcdf4
1413
- numpy <1.24 # https://github.com/numba/numba/issues/8615#issuecomment-1360792615
1514
- numba # required by xesmf

docs/index.rst

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,30 @@
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.
55
6-
`extract_model`
7-
===============
6+
Welcome to extract_model's documentation!
7+
=========================================
88

99
Use `extract_model` to read select output from model output files by time and/or space. Output will be selected using `xarray` by a combination of interpolation and index selection. Horizontal interpolation is accomplished using `xESMF` and time interpolation is done with `xarray`'s native 1D interpolation. Currently vertical interpolation is only possible using `xarray`'s 1D interpolation too and is not set up to interpolate in 4D as would be required for ROMS output if not simply selecting the surface layer.
1010

11+
Installation
12+
------------
13+
1114
To install from conda-forge:
1215

13-
>>> conda install -c conda-forge ocean-model-skill-assessor
16+
>>> conda install -c conda-forge extract_model
1417

1518
To install from PyPI:
1619

17-
>>> pip install cf-pandas
20+
>>> pip install extract_model
1821

1922
.. toctree::
2023
:maxdepth: 2
2124
:hidden:
2225
:caption: Examples and demos
2326

24-
models.md
25-
unstructured_subsetting.md
26-
ts_work.md
27+
models.ipynb
28+
unstructured_subsetting.ipynb
29+
ts_work.ipynb
2730
api
2831

2932
.. toctree::

0 commit comments

Comments
 (0)