From 88bd2fe4fbb3e3639e0be9bba71093e0601d6903 Mon Sep 17 00:00:00 2001 From: brynpickering Date: Thu, 29 Jul 2021 16:57:04 +0200 Subject: [PATCH] Update Sphinx and dependency --- changelog.rst | 2 +- doc/conf.py | 2 +- requirements_docs.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.rst b/changelog.rst index cdd7af17e..765ac9f75 100644 --- a/changelog.rst +++ b/changelog.rst @@ -14,7 +14,7 @@ Release History |new| `model.backend.rerun()` can work with both `spores` and `plan` run modes (previously only `plan` worked). In the `spores` case, this only works with a built backend that has not been previously run (i.e. `model.run(build_only=True)`), but allows a user to update constraints etc. before running the SPORES method. -|changed||backwards-incompatible| Carrier-specific group constraints are only allowed in isolation (one constraint in the group). +|changed| |backwards-incompatible| Carrier-specific group constraints are only allowed in isolation (one constraint in the group). |changed| If `ensure_feasibility` is set to `True`, `unmet_demand` will always be returned in the model results, even if the model is feasible. Fixes issue #355. diff --git a/doc/conf.py b/doc/conf.py index 6651971e8..511273979 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -18,7 +18,7 @@ sys.path.append(os.path.abspath("_extensions")) sys.path.append(os.path.abspath("helpers")) -from sphinx.builders.html import StandaloneHTMLBuilder, SingleFileHTMLBuilder +from sphinx.builders.singlehtml import StandaloneHTMLBuilder, SingleFileHTMLBuilder import generate_tables # from helpers diff --git a/requirements_docs.yml b/requirements_docs.yml index 5c3f6ba74..0f84df1aa 100644 --- a/requirements_docs.yml +++ b/requirements_docs.yml @@ -5,7 +5,7 @@ channels: dependencies: - python=3.7 # https://docs.readthedocs.io/en/stable/config-file/v2.html#python-version - - sphinx>=2.3 + - sphinx=4.1.2 - numpydoc - ruamel.yaml - nbconvert # To generate HTML files from example notebooks