Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

automate docs discovery of iris and python versions #3981

Merged
merged 5 commits into from
Feb 8, 2021
Merged
Show file tree
Hide file tree
Changes from 4 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
16 changes: 9 additions & 7 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,13 +93,14 @@ 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
rst_epilog = """
.. |copyright_years| replace:: {year_range}
""".format(
year_range="2010 - {}".format(upper_copy_year)
)
# Create a variable that can be inserted in the rst "|copyright_years|".
# You can add more variables here if needed.
rst_epilog = f"""
.. |copyright_years| replace:: {2010 - upper_copy_year}
Copy link
Member

Choose a reason for hiding this comment

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

I think this should probably be: 2010 - {upper_copy_year}?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oopsie... good spot 👀

.. |python_version| replace:: {'.'.join([str(i) for i in sys.version_info[:3]])}
.. |iris_version| replace:: v{version}
.. |build_date| replace:: ({datetime.datetime.now().strftime('%d %b %Y')})
"""

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
Expand Down
38 changes: 19 additions & 19 deletions docs/src/developers_guide/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,36 +121,35 @@ 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
~~~~~~~~~~~~~

#. Create the branch ``1.9.x`` on the main repo, not in a forked repo, for the
release candidate or release. The only exception is for a point/bugfix
release as it should already exist
#. Create the release feature branch ``1.9.x`` on `SciTools/iris`_.
The only exception is for a point/bugfix release, as it should already exist
#. Update the ``iris.__init__.py`` version string e.g., to ``1.9.0``
#. 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
* 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)``
* 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`` remove the ``[unreleased]`` caption from the page title.
Note that, the Iris version and release date are updated automatically
when the documentation is built
* 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``
#. Check your changes by building the documentation and viewing the changes
#. Check your changes by building the documentation and reviewing
#. Once all the above steps are complete, the release is cut, using
the :guilabel:`Draft a new release` button on the
`Iris release page <https://github.com/SciTools/iris/releases>`_
Expand All @@ -170,9 +169,10 @@ Post Release Steps
new headings
#. Add back in the reference to ``latest.rst`` to the what's new index
``docs/src/whatsnew/index.rst``
#. Update ``Iris.__init__.py`` version string to show as ``1.10.dev0``
#. Update ``iris.__init__.py`` version string to show as ``1.10.dev0``
#. Merge back to master


.. _Read The Docs: https://readthedocs.org/projects/scitools-iris/builds/
.. _SciTools/iris: https://github.com/SciTools/iris
.. _tag on the SciTools/Iris: https://github.com/SciTools/iris/releases
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| |build_date| [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| |build_date| [unreleased]
****************************************

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