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

* upstream/main: update rtd ubuntu and mambaforge (SciTools#5702)
tkknight · Jan 17, 2024 · e16dc94 · e16dc94
2 parents 0e37e7b + ec709b3
commit e16dc94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: "ubuntu-22.04"
   tools:
-    python: mambaforge-4.10
+    python: "mambaforge-22.9"
   jobs:
     post_checkout:
       # The SciTools/iris repository is shallow i.e., has a .git/shallow,

diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst
@@ -123,6 +123,9 @@ This document explains the changes made to Iris for this release
 #. `@tkknight`_ enforced the temporary pin of ``pydata-sphinx-theme==0.14.4`` to fix
    the missing toctree in the sidebar. (:pull:`5694`)
 
+#. `@bjlittle`_ updated ``ubuntu`` and ``mambaforge`` to the latest versions for ``readthedocs``
+   (:pull:`5702`)
+
 
 📚 Documentation
 ================