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

* upstream/main:
  Implement Pydata theme (SciTools#4661)
  tweak whatsnew (SciTools#4682)
  Bump peter-evans/create-pull-request from 4.0.0 to 4.0.1 (SciTools#4675)
  Reorder Constraints sections of user guide, add time bounds example (SciTools#4656)
  Updated environment lockfiles (SciTools#4678)
  Updated environment lockfiles (SciTools#4677)
  Automatic reversal of DimCoord bounds (SciTools#4466)
  'Deep' benchmarks to catch scaling with field count (SciTools#4654)
  Updated environment lockfiles (SciTools#4655)
  Fixed cube arithmetic for cubes with meshes. (SciTools#4651)
  update black (SciTools#4668)
  Include note to strip out Artifactory (SciTools#4666)
  Fix nearest_neighbour_index for edge case where requested point is float and bounds are int (SciTools#4245)
  Lazy Percentile Aggregator (SciTools#3901)
  Preserve position when replacing Axes with GeoAxes (SciTools#4273)

.cirrus.yml

@@ -30,7 +30,7 @@ env:
   # Increment the build number to force new conda cache upload.
   CONDA_CACHE_BUILD: "0"
   # Increment the build number to force new nox cache upload.
-  NOX_CACHE_BUILD: "0"
+  NOX_CACHE_BUILD: "2"
   # Increment the build number to force new pip cache upload.
   PIP_CACHE_BUILD: "0"
   # Pip packages to be upgraded/installed.

.github/workflows/refresh-lockfiles.yml

@@ -72,7 +72,7 @@ jobs:
         
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
+        uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f
         with:
           commit-message: Updated environment lockfiles
           committer: "Lockfile bot <noreply@github.com>"

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
     -   id: no-commit-to-branch
 
 -   repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
     -   id: black
         pass_filenames: false

benchmarks/benchmarks/load/__init__.py

@@ -24,8 +24,10 @@
 
 
 class LoadAndRealise:
+    # For data generation
+    timeout = 600.0
     params = [
-        [(2, 2, 2), (1280, 960, 5)],
+        [(2, 2, 2), (1280, 960, 5), (2, 2, 1000)],
         [False, True],
         ["FF", "PP", "NetCDF"],
     ]
@@ -68,7 +70,7 @@ def time_realise(self, _, __, ___, ____) -> None:
 
 class STASHConstraint:
     # xyz sizes mimic LoadAndRealise to maximise file re-use.
-    params = [[(2, 2, 2), (1280, 960, 5)], ["FF", "PP"]]
+    params = [[(2, 2, 2), (1280, 960, 5), (2, 2, 1000)], ["FF", "PP"]]
     param_names = ["xyz", "file_format"]
 
     def setup_cache(self) -> dict:
@@ -155,7 +157,7 @@ class StructuredFF:
     avoiding the cost of merging.
     """
 
-    params = [[(2, 2, 2), (1280, 960, 5)], [False, True]]
+    params = [[(2, 2, 2), (1280, 960, 5), (2, 2, 1000)], [False, True]]
     param_names = ["xyz", "structured_loading"]
 
     def setup_cache(self) -> dict:

docs/gallery_code/README.rst

@@ -1,3 +1,5 @@
+.. _gallery_index:
+
 Gallery
 =======
 

docs/gallery_code/general/README.rst

@@ -1,2 +1,3 @@
 General
 -------
+