Skip to content

Commit

Permalink
Merge pull request #177 from OSeMOSYS/develop
Browse files Browse the repository at this point in the history
Docs build fix for v1.0.3
  • Loading branch information
trevorb1 authored May 3, 2023
2 parents 5dc646c + 7d36c92 commit 56baf80
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
12 changes: 6 additions & 6 deletions docs/data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ This page explains the different data formatting options available in otoole. Fi
the format of the user configuration file is explained. Following this, the different
input data formats are explained.

.. SEEALSO::
See the Simplicity_ repository for a full example of these formats

User Configuration File
-----------------------

Expand All @@ -30,9 +33,6 @@ The table below highlights what information is required for each ``Set``,
``Parameter`` and ``Result`` definition in the configuration file. Required values are
given by **X**, while optional values are given by **(X)**.

.. deprecated:: v1.0.3
The **Calculated** keyword is no longer needed for Result definitions

+-------------+------+------------+---------+
| | Set | Parameter | Result |
+=============+======+============+=========+
Expand All @@ -47,6 +47,9 @@ given by **X**, while optional values are given by **(X)**.
| default | | X | X |
+-------------+------+------------+---------+

.. deprecated:: v1.0.3
The ``Calculated`` keyword is no longer needed for Result definitions

.. WARNING::
Names longer than 31 characters require a ``short_name`` field. This is due
to character limits on excel sheet names. ``otoole`` will raise an error if a
Expand Down Expand Up @@ -141,9 +144,6 @@ Overview
This section will describe how to format data for ``excel``, ``csv``, and ``datafile``
formats.

.. SEEALSO::
See the Simplicity_ repository for a full example of these formats

Excel
~~~~~

Expand Down
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ Jinja2<3.1
# under `install_requires` in `setup.cfg` is also listed here!
sphinx>=3.2.1
sphinx-book-theme
urllib3<2
# sphinx_rtd_theme

0 comments on commit 56baf80

Please sign in to comment.