Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def autolog(message):
for item, value in os.environ.items():
autolog("[READTHEDOCS] {} = {}".format(item, value))


# -- Path setup --------------------------------------------------------------

# If extensions (or modules to document with autodoc) are in another directory,
Expand Down Expand Up @@ -92,12 +93,16 @@ def autolog(message):

# -- General configuration ---------------------------------------------------

# Create a variable that can be insterted in the rst "|copyright_years|".
# You can add more vairables here if needed
# Create a variable that can be inserted in the rst "|copyright_years|".
# You can add more variables here if needed.
rst_epilog = """
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for using format strings in the .format method, rather than having a single format string

f"""
|copyright_years| replace:: 2010 - {upper_copy_year}
[...etc]
"""

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, could do, thanks.

I was lazily following what was there before... I'll tidy it up 👍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Nice, that's way tidier, thanks.

.. |copyright_years| replace:: {year_range}
.. |python_version| replace:: {python_version}
.. |iris_version| replace:: {iris_version}
""".format(
year_range="2010 - {}".format(upper_copy_year)
year_range=f"2010 - {upper_copy_year}",
python_version=".".join([str(i) for i in sys.version_info[:3]]),
iris_version=f"v{version}",
)

# Add any Sphinx extension module names here, as strings. They can be
Expand Down
27 changes: 14 additions & 13 deletions docs/src/developers_guide/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ release process is to be followed, including the merge back of changes into
Maintainer Steps
----------------

These steps assume a release for ``v1.9`` is to be created
These steps assume a release for ``v1.9`` is to be created.

Release Steps
~~~~~~~~~~~~~
Expand All @@ -131,25 +131,26 @@ Release Steps
release as it should already exist
#. Update the what's new for the release:

* Copy ``docs/src/whatsnew/latest.rst`` to a file named
``v1.9.rst``
* Delete the ``docs/src/whatsnew/latest.rst`` file so it will not
cause an issue in the build
* Use git to rename ``docs/src/whatsnew/latest.rst`` to the release
version file ``v1.9.rst``
* Use git to delete the ``docs/src/whatsnew/latest.rst.template`` file
* In ``v1.9.rst`` update the page title (first line of the file) to show
the date and version in the format of ``v1.9 (DD MMM YYYY)``. For
example ``v1.9 (03 Aug 2020)``
the release date in the format of ``v1.9 (DD MMM YYYY)``. For
example ``v1.9 (03 Aug 2020)``. Note that, the release version in the
title is updated automatically
* Review the file for correctness
* Work with the development team to create a 'highlights' section at the
top of the file, providing extra detail on notable changes
* Add ``v1.9.rst`` to git and commit all changes, including removal of
``latest.rst``
* Work with the development team to populate the ``Release Highlights``
dropdown at the top of the file, which provides extra detail on notable
changes
* Use git to add and commit all changes, including removal of
``latest.rst.template``

#. Update the what's new index ``docs/src/whatsnew/index.rst``

* Temporarily remove reference to ``latest.rst``
* Remove the reference to ``latest.rst``
* Add a reference to ``v1.9.rst`` to the top of the list

#. Update the ``Iris.__init__.py`` version string, to ``1.9.0``
#. Update the ``iris.__init__.py`` version string e.g., to ``1.9.0``
#. Check your changes by building the documentation and viewing the changes
#. Once all the above steps are complete, the release is cut, using
the :guilabel:`Draft a new release` button on the
Expand Down
11 changes: 7 additions & 4 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. include:: ../common_links.inc

<unreleased>
************
|iris_version| (unreleased)
***************************

This document explains the changes made to Iris for this release
(:doc:`View all changes <index>`.)
Expand Down Expand Up @@ -77,8 +77,11 @@ This document explains the changes made to Iris for this release
(:pull:`3958`)

#. `@bjlittle`_ clarified in the doc-string that :class:`~iris.coords.Coord`
is now an `abstract base class`_ of coordinates since Iris ``3.0.0``, and
it is **not** possible to create an instance of it. (:pull:`3971`)
is now an `abstract base class`_ since Iris ``3.0.0``, and it is **not**
possible to create an instance of it. (:pull:`3971`)

#. `@bjlittle`_ added automated Iris version discovery for the ``latest.rst``
in the ``whatsnew`` documentation. (:pull:`3981`)


💼 Internal
Expand Down
4 changes: 2 additions & 2 deletions docs/src/whatsnew/latest.rst.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. include:: ../common_links.inc

<unreleased>
************
|iris_version| (unreleased)
***************************

This document explains the changes made to Iris for this release
(:doc:`View all changes <index>`.)
Expand Down