Merge 71fa550 into df4c52b

stephenworsley · web-flow · commit 64abf74bec8c · 2024-12-18T12:20:22.000Z
diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst
@@ -71,7 +71,8 @@ This document explains the changes made to Iris for this release
 🔗 Dependencies
 ===============
 
-#. N/A
+#. `@stephenworsley`_ pinned dask to <2024.9 due to an indexing bug. (:issue:`6251`,
+   :pull:`6255`)
 
 
 📚 Documentation
diff --git a/lib/iris/common/resolve.py b/lib/iris/common/resolve.py
@@ -2592,9 +2592,9 @@ def shape(self):
                     source                      'Data from Met Office Unified Model 6.05'
             >>> Resolve().shape is None
             True
-            >>> Resolve(cube1, cube2).shape
+            >>> Resolve(cube1, cube2).shape  # doctest: +SKIP
             (240, 37, 49)
-            >>> Resolve(cube2, cube1).shape
+            >>> Resolve(cube2, cube1).shape  # doctest: +SKIP
             (240, 37, 49)
 
         """  # noqa: D214, D406, D407, D410, D411
diff --git a/requirements/locks/py310-linux-64.lock b/requirements/locks/py310-linux-64.lock
diff --git a/requirements/locks/py311-linux-64.lock b/requirements/locks/py311-linux-64.lock
diff --git a/requirements/locks/py312-linux-64.lock b/requirements/locks/py312-linux-64.lock
diff --git a/requirements/py310.yml b/requirements/py310.yml
@@ -14,7 +14,7 @@ dependencies:
   - cartopy >=0.21
   - cf-units >=3.1
   - cftime >=1.5
-  - dask-core >=2022.9.0,!=2024.8.0
+  - dask-core >=2022.9.0,!=2024.8.0, <2024.9
   - libnetcdf !=4.9.1
   - matplotlib-base >=3.5, !=3.9.1
   - netcdf4
diff --git a/requirements/py311.yml b/requirements/py311.yml
@@ -14,7 +14,7 @@ dependencies:
   - cartopy >=0.21
   - cf-units >=3.1
   - cftime >=1.5
-  - dask-core >=2022.9.0,!=2024.8.0
+  - dask-core >=2022.9.0,!=2024.8.0, <2024.9
   - libnetcdf !=4.9.1
   - matplotlib-base >=3.5, !=3.9.1
   - netcdf4
diff --git a/requirements/py312.yml b/requirements/py312.yml
@@ -14,7 +14,7 @@ dependencies:
   - cartopy >=0.21
   - cf-units >=3.1
   - cftime >=1.5
-  - dask-core >=2022.9.0,!=2024.8.0
+  - dask-core >=2022.9.0,!=2024.8.0, <2024.9
   - libnetcdf !=4.9.1
   - matplotlib-base >=3.5, !=3.9.1
   - netcdf4
diff --git a/requirements/pypi-core.txt b/requirements/pypi-core.txt
@@ -1,7 +1,7 @@
 cartopy>=0.21
 cf-units>=3.1
 cftime>=1.5.0
-dask[array]>=2022.9.0,!=2024.8.0
+dask[array]>=2022.9.0,!=2024.8.0, <2024.9
 # libnetcdf!=4.9.1 (not available on PyPI)
 matplotlib>=3.5
 netcdf4
