Merge remote-tracking branch 'upstream/main' into dark_theme

* upstream/main: Unpin theme (SciTools#5129) link percentile as lazy option (SciTools#5128)
tkknight · Jan 5, 2023 · 163b56f · 163b56f
2 parents d2024e7 + e1fae5e
commit 163b56f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/docs/src/_templates/layout.html b/docs/src/_templates/layout.html
@@ -11,7 +11,7 @@
         <div id="slim-red-box-banner">
             You are viewing the <b>latest</b> unreleased documentation
             <b>v{{ version }}</b>. You can switch to a <b>stable</b> version
-            via the flyout menu in the bottom-right of the screen.
+            via the flyout menu in the bottom corner of the screen.
         </div>
         <p></p>
     {%- endif %}

diff --git a/docs/src/conf.py b/docs/src/conf.py
@@ -331,14 +331,14 @@ def _dotv(version):
     "github_user": "scitools",
     "github_version": "main",
     "doc_path": "docs/src",
+    "default_mode": "auto",
     # custom
     "on_rtd": on_rtd,
     "rtd_version": rtd_version,
     "rtd_version_type": rtd_version_type,
     "version": version,
     "copyright_years": copyright_years,
     "python_version": build_python_version,
-    "default_mode": "auto",
     "commit_sha": commit_sha,
 }
 

diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst
@@ -62,6 +62,13 @@ This document explains the changes made to Iris for this release
 ================
 
 #. `@rcomer`_ clarified instructions for updating gallery tests. (:pull:`5100`)
+#. `@tkknight`_ unpinned ``pydata-sphinx-theme`` and set the default to use
+   the light version (not dark) while we make the docs dark mode friendly
+   (:pull:`5129`)
+
+#. `@rcomer`_ linked the :obj:`~iris.analysis.PERCENTILE` aggregator from the
+   :obj:`~iris.analysis.MEDIAN` docstring, noting that the former handles lazy
+   data. (:pull:`5128`)
 
 
 💼 Internal

diff --git a/lib/iris/analysis/__init__.py b/lib/iris/analysis/__init__.py
@@ -1914,7 +1914,8 @@ def interp_order(length):
 
     result = cube.collapsed('longitude', iris.analysis.MEDIAN)
 
-This aggregator handles masked data, but NOT lazy data.
+This aggregator handles masked data, but NOT lazy data.  For lazy aggregation,
+please try :obj:`~.PERCENTILE`.
 
 """
 

diff --git a/requirements/ci/py310.yml b/requirements/ci/py310.yml
@@ -48,7 +48,7 @@ dependencies:
   - sphinx-copybutton
   - sphinx-gallery >=0.11.0
   - sphinx-panels
-  - pydata-sphinx-theme = 0.8.1
+  - pydata-sphinx-theme
 
 # Temporary minimum pins.
 # See https://github.com/SciTools/iris/pull/5051

diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml
@@ -49,5 +49,4 @@ dependencies:
   - sphinx-gallery >=0.11.0
   - sphinx-panels
   - pydata-sphinx-theme
-  - sphinx-togglebutton
 
diff --git a/requirements/ci/py39.yml b/requirements/ci/py39.yml
@@ -48,7 +48,7 @@ dependencies:
   - sphinx-copybutton
   - sphinx-gallery >=0.11.0
   - sphinx-panels
-  - pydata-sphinx-theme = 0.8.1
+  - pydata-sphinx-theme
 
 # Temporary minimum pins.
 # See https://github.com/SciTools/iris/pull/5051