Skip to content

Commit

Permalink
Update Sphinx and dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
brynpickering committed Jul 29, 2021
1 parent 0bd7cc1 commit 88bd2fe
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion requirements_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 88bd2fe

Please sign in to comment.