Skip to content
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

Jump to bottom

Fix issue 608 #615

Merged
merged 7 commits into from
Aug 17, 2023
Merged

Fix issue 608 #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11741b0
Update pyproject.toml
raoulcollenteur Aug 11, 2023
66db3c2
try using myst
raoulcollenteur Aug 11, 2023
32a9773
Update pyproject.toml
raoulcollenteur Aug 11, 2023
9f9117e
remove nbsphinx dependency
raoulcollenteur Aug 11, 2023
902b732
Update index.rst
raoulcollenteur Aug 16, 2023
5db4ab5
Update index.rst
raoulcollenteur Aug 16, 2023
ad0bf37
Update index.rst
raoulcollenteur Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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.
Expand Down Expand Up @@ -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"
42 changes: 21 additions & 21 deletions doc/examples/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------
Expand All @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ ci = [
]
rtd = [
"pastas[solvers]",
"nbsphinx",
"Ipython",
"ipykernel",
"pydata-sphinx-theme",
Expand All @@ -71,6 +70,7 @@ rtd = [
"requests",
"numpydoc",
"sphinx-design",
"myst_nb",
]
dev = ["tox", "pastas[formatting,linting,ci,rtd]"]
numbascipy = ["numba-scipy >= 0.3.1"]
Expand Down