Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into numpydocs_misc
Browse files Browse the repository at this point in the history
* upstream/main:
  DOCS: API docs ToC more levels (SciTools#5714)
  Bump scitools/workflows from 2024.01.0 to 2024.02.0 (SciTools#5726)
  • Loading branch information
tkknight committed Feb 3, 2024
2 parents 2ba3085 + 6c7bf61 commit 9cb9c03
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ concurrency:
jobs:
manifest:
name: "check-manifest"
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.01.0
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.02.0
2 changes: 1 addition & 1 deletion .github/workflows/refresh-lockfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ on:

jobs:
refresh_lockfiles:
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.01.0
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.02.0
secrets: inherit
16 changes: 12 additions & 4 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,17 @@ def _dotv(version):
# See https://www.sphinx-doc.org/en/master/usage/extensions/todo.html
todo_include_todos = True

# api generation configuration
autodoc_member_order = "alphabetical"
autodoc_default_flags = ["show-inheritance"]
# sphinx.ext.autodoc configuration --------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html#confval-autodoc_default_options
autodoc_default_options = {
"members": True,
"member-order": "alphabetical",
"undoc-members": True,
"private-members": False,
"special-members": False,
"inherited-members": True,
"show-inheritance": True,
}

# https://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html#confval-autodoc_typehints
autodoc_typehints = "none"
Expand Down Expand Up @@ -292,6 +300,7 @@ def _dotv(version):
"footer_start": ["copyright", "sphinx-version"],
"footer_end": ["custom_footer"],
"navigation_depth": 3,
"show_toc_level": 2,
"show_prev_next": True,
"navbar_align": "content",
# removes the search box from the top bar
Expand Down Expand Up @@ -319,7 +328,6 @@ def _dotv(version):
},
],
"use_edit_page_button": True,
"show_toc_level": 1,
# Omit `theme-switcher` from navbar_end below to disable it
# Info: https://pydata-sphinx-theme.readthedocs.io/en/stable/user_guide/light-dark.html#configure-default-theme-mode
# "navbar_end": ["navbar-icon-links"],
Expand Down
3 changes: 3 additions & 0 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ This document explains the changes made to Iris for this release
#. `@tkknight`_ added ruff documentation in the :ref:`developer_testing_ci` of the
:ref:`developers_guide`. (:pull:`5701`)

#. `@tkknight`_ configured the API documentation to show 2 levels
for the ToC (Table of Contents) for each page. (:pull:`5714`)


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

0 comments on commit 9cb9c03

Please sign in to comment.