Skip to content

Commit 00e79c5

Browse files
stephenworsleyESadek-MO
authored andcommitted
Pin dask <2024.9 (SciTools#6255)
* pin dask <2024.9 * update lockfiles * update for pypi * add whatsnew, fix tests * skip failing doctests
1 parent 7f97336 commit 00e79c5

File tree

8 files changed

+615
-345
lines changed

8 files changed

+615
-345
lines changed

lib/iris/common/resolve.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2592,9 +2592,9 @@ def shape(self):
25922592
source 'Data from Met Office Unified Model 6.05'
25932593
>>> Resolve().shape is None
25942594
True
2595-
>>> Resolve(cube1, cube2).shape
2595+
>>> Resolve(cube1, cube2).shape # doctest: +SKIP
25962596
(240, 37, 49)
2597-
>>> Resolve(cube2, cube1).shape
2597+
>>> Resolve(cube2, cube1).shape # doctest: +SKIP
25982598
(240, 37, 49)
25992599
26002600
""" # noqa: D214, D406, D407, D410, D411

requirements/locks/py310-linux-64.lock

+203-113
Large diffs are not rendered by default.

requirements/locks/py311-linux-64.lock

+203-113
Large diffs are not rendered by default.

requirements/locks/py312-linux-64.lock

+203-113
Large diffs are not rendered by default.

requirements/py310.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- cartopy >=0.21
1515
- cf-units >=3.1
1616
- cftime >=1.5
17-
- dask-core >=2022.9.0,!=2024.8.0
17+
- dask-core >=2022.9.0,!=2024.8.0, <2024.9
1818
- libnetcdf !=4.9.1
1919
- matplotlib-base >=3.5, !=3.9.1
2020
- netcdf4

requirements/py311.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- cartopy >=0.21
1515
- cf-units >=3.1
1616
- cftime >=1.5
17-
- dask-core >=2022.9.0,!=2024.8.0
17+
- dask-core >=2022.9.0,!=2024.8.0, <2024.9
1818
- libnetcdf !=4.9.1
1919
- matplotlib-base >=3.5, !=3.9.1
2020
- netcdf4

requirements/py312.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- cartopy >=0.21
1515
- cf-units >=3.1
1616
- cftime >=1.5
17-
- dask-core >=2022.9.0,!=2024.8.0
17+
- dask-core >=2022.9.0,!=2024.8.0, <2024.9
1818
- libnetcdf !=4.9.1
1919
- matplotlib-base >=3.5, !=3.9.1
2020
- netcdf4

requirements/pypi-core.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cartopy>=0.21
22
cf-units>=3.1
33
cftime>=1.5.0
4-
dask[array]>=2022.9.0,!=2024.8.0
4+
dask[array]>=2022.9.0,!=2024.8.0, <2024.9
55
# libnetcdf!=4.9.1 (not available on PyPI)
66
matplotlib>=3.5
77
netcdf4

0 commit comments

Comments
 (0)