diff --git a/doc/conf.py b/doc/conf.py index 4500c4e4..9bf90ea6 100755 --- a/doc/conf.py +++ b/doc/conf.py @@ -35,8 +35,8 @@ "sphinx.ext.ifconfig", "sphinx.ext.viewcode", "IPython.sphinxext.ipython_console_highlighting", # lowercase didn't work - "nbsphinx", "numpydoc", + "myst_nb", "sphinxcontrib.bibtex", "sphinx_design", "sphinx.ext.autosectionlabel", @@ -52,7 +52,7 @@ # General information about the project. project = "Pastas" -copyright = "{}, R.A. Collenteur, M. Bakker, R. Calje, F. Schaars".format(year) +copyright = "{}, The Pastas Team".format(year) author = "R.A. Collenteur, M. Bakker, R. Calje, F. Schaars" # The version. @@ -170,7 +170,7 @@ "matplotlib": ("https://matplotlib.org/stable", None), } -# -- nbsphinx options---------- ------------------------------------------------------- +# -- myst_nb options ------------------------------------------------------------------ -nbsphinx_allow_errors = True # Allow errors in notebooks, to see the error online -nbsphinx_execute = "auto" +nb_execution_allow_errors = True # Allow errors in notebooks, to see the error online +nb_execution_mode = "auto" diff --git a/doc/examples/index.rst b/doc/examples/index.rst index 824c2c24..46308904 100644 --- a/doc/examples/index.rst +++ b/doc/examples/index.rst @@ -45,11 +45,11 @@ Basics `Modeling with different timesteps`_ -.. _Preprocessing user-provided time series: prepare_timeseries.ipynb -.. _A basic model: basic_model.ipynb -.. _Fixating parameters while fitting: fix_parameters.ipynb -.. _Calibration: calibration_options.ipynb -.. _Modeling with different timesteps: modeling_timestep.ipynb +.. _Preprocessing user-provided time series: prepare_timeseries.html +.. _A basic model: basic_model.html +.. _Fixating parameters while fitting: fix_parameters.html +.. _Calibration: calibration_options.html +.. _Modeling with different timesteps: modeling_timestep.html Stressmodels ------------ @@ -64,11 +64,11 @@ Stressmodels `Changing response functions`_ -.. _Adding surface water levels: adding_rivers.ipynb -.. _Adding pumping wells: adding_wells.ipynb -.. _Adding multiple wells: multiple_wells.ipynb -.. _Adding trends: adding_trends.ipynb -.. _Changing response functions: changing_responses.ipynb +.. _Adding surface water levels: adding_rivers.html +.. _Adding pumping wells: adding_wells.html +.. _Adding multiple wells: multiple_wells.html +.. _Adding trends: adding_trends.html +.. _Changing response functions: changing_responses.html Non-linear (Recharge) Models ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -81,10 +81,10 @@ Non-linear (Recharge) Models `Modeling snow`_ -.. _Threshold non-linearities: threshold_non_linear.ipynb -.. _Non-linear recharge models: non_linear_recharge.ipynb -.. _Estimating recharge: recharge_estimation.ipynb -.. _Modeling snow: snowmodel.ipynb +.. _Threshold non-linearities: threshold_non_linear.html +.. _Non-linear recharge models: non_linear_recharge.html +.. _Estimating recharge: recharge_estimation.html +.. _Modeling snow: snowmodel.html Model Evaluation @@ -100,11 +100,11 @@ Model Evaluation `MCMC uncertainty`_ -.. _Comparing models visually: comparing_models.ipynb -.. _Diagnostic checking: diagnostic_checking.ipynb -.. _`Reducing autocorrelation`: timestep_analysis.ipynb -.. _Uncertainty quantification: uncertainty.ipynb -.. _MCMC uncertainty: uncertainty_emcee.ipynb +.. _Comparing models visually: comparing_models.html +.. _Diagnostic checking: diagnostic_checking.html +.. _`Reducing autocorrelation`: timestep_analysis.html +.. _Uncertainty quantification: uncertainty.html +.. _MCMC uncertainty: uncertainty_emcee.html Applications @@ -114,8 +114,8 @@ Applications `Groundwater signatures`_ -.. _Standardized Groundwater Index: standardized_groundwater_index.ipynb -.. _Groundwater signatures: signatures.ipynb +.. _Standardized Groundwater Index: standardized_groundwater_index.html +.. _Groundwater signatures: signatures.html STOWA Manual (Dutch only) diff --git a/pyproject.toml b/pyproject.toml index fd30ef9f..93873e35 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,6 @@ ci = [ ] rtd = [ "pastas[solvers]", - "nbsphinx", "Ipython", "ipykernel", "pydata-sphinx-theme", @@ -71,6 +70,7 @@ rtd = [ "requests", "numpydoc", "sphinx-design", + "myst_nb", ] dev = ["tox", "pastas[formatting,linting,ci,rtd]"] numbascipy = ["numba-scipy >= 0.3.1"]