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.

Sign up for GitHub

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

Jump to bottom

Whats new for pr3871 #3875

Merged
merged 3 commits into from
Sep 22, 2020
Merged

Whats new for pr3871 #3875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2f441e
Added whats new for pr3871
tkknight Sep 22, 2020
f52bf45
Merge branch 'master' into whats_new_for_pr3871
tkknight Sep 22, 2020
d42ccf8
Added line feed
tkknight Sep 22, 2020
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
2 changes: 2 additions & 0 deletions docs/iris/src/common_links.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
.. _New Issue: https://github.com/scitools/iris/issues/new/choose
.. _matplotlib: https://matplotlib.org/
.. _conda: https://docs.conda.io/en/latest/
.. _sphinx: https://www.sphinx-doc.org/en/master/
.. _napolean: https://sphinxcontrib-napoleon.readthedocs.io/en/latest/sphinxcontrib.napoleon.html
Copy link
Member

Choose a reason for hiding this comment

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

@tkknight I'm surprised these aren't in alphabetical order... just joking 🤣

4 changes: 4 additions & 0 deletions docs/iris/src/whatsnew/latest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,10 @@ This document explains the changes made to Iris for this release
refused and thus travis-ci_ job failures. For more information on linkcheck,
see :ref:`contributing.documentation.testing`. (:pull:`3873`)

* `@tkknight`_ enabled the napolean_ package that is used by sphinx_ to cater
for the existing google style docstrings and to also allow for numpy
docstrings. This resolves :issue:`3841`. (:pull:`3871`)


💼 Internal
===========
Expand Down