From 0b27820d852b8d03d6e2eae3f540d6b74bdb6a57 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Wed, 3 May 2023 11:15:57 -0700 Subject: [PATCH 1/3] lock urllib3 version --- docs/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index 90dee9a7..4afe7af2 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -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 From 81bcff13e6f38ced5e56ce31b34f04aa2d6e6aed Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Wed, 3 May 2023 11:36:54 -0700 Subject: [PATCH 2/3] fix typo --- docs/data.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/data.rst b/docs/data.rst index 3e34b96f..288a7d96 100644 --- a/docs/data.rst +++ b/docs/data.rst @@ -30,9 +30,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 | +=============+======+============+=========+ @@ -47,6 +44,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 From 7d36c921dc186faffd615377b9f9d5e8ec90f6a6 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Wed, 3 May 2023 11:52:58 -0700 Subject: [PATCH 3/3] fixed docs typo --- docs/data.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/data.rst b/docs/data.rst index 288a7d96..4328c3f9 100644 --- a/docs/data.rst +++ b/docs/data.rst @@ -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 ----------------------- @@ -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 ~~~~~