Merge beb6de1 into df4c52b

Author: stephenworsley

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

lib/iris/common/resolve.py

@@ -122,6 +122,8 @@ class Resolve:
         import iris
         import numpy as np
         from iris.common import Resolve
+        # See https://github.com/dask/dask/issues/11433
+        np.set_printoptions(legacy="1.25")
         cube1 = iris.load_cube(iris.sample_data_path("A1B_north_america.nc"))
         cube2 = iris.load_cube(iris.sample_data_path("E1_north_america.nc"))[0]
         cube2.transpose()

requirements/locks/py310-linux-64.lock

@@ -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

requirements/locks/py311-linux-64.lock

@@ -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

requirements/locks/py312-linux-64.lock

@@ -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

requirements/py310.yml

@@ -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