Skip to content

Commit 5ec6087

Browse files
Update Dask dependencies after new max pin
1 parent c4285a5 commit 5ec6087

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

Changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ version 3.17.0
2222
* Changed dependency: ``Python>=3.9.0``
2323
* Changed dependency: ``numpy>=2.0.0``
2424
* Changed dependency: ``cfdm>=1.12.1.0, <1.12.2.0``
25-
* Changed dependency: ``dask>=2025.2.0``
25+
* Changed dependency: ``dask>=2025.2.0, <=2025.3.0``
2626
* Changed dependency: ``netCDF4>=1.7.2``
2727
* Changed dependency: ``cftime>=1.6.4``
2828
* Changed optional dependency: ``esmpy>=8.7.0``

cf/__init__.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
raise RuntimeError(
131131
"Bad cfdm version: cf requires "
132132
f"{_minimum_vn}<=cfdm<{_maximum_vn}. "
133-
f"Got {cfdm.__version__} at {cfdm.__file__}"
133+
f"Got {_cfdm_version} at {cfdm.__file__}"
134134
)
135135

136136
__cf_version__ = cfdm.__cf_version__
@@ -202,10 +202,15 @@
202202
raise ImportError(_error0 + str(error1))
203203
else:
204204
_minimum_vn = "2025.2.0"
205-
if Version(dask.__version__) < Version(_minimum_vn):
206-
raise ValueError(
207-
f"Bad dask version: cf requires dask>={_minimum_vn}. "
208-
f"Got {dask.__version__} at {dask.__file__}"
205+
# Note in this case max is inclusive, change inequalities if this changes
206+
_maximum_vn = "2025.3.0"
207+
_dask_version = Version(dask.__version__)
208+
if _dask_version < Version(_minimum_vn) or _dask_version > Version(
209+
_maximum_vn
210+
):
211+
raise RuntimeError(
212+
"Bad dask version: cf requires "
213+
f"{_minimum_vn}<=dask<={_maximum_vn}. Got {_dask_version}."
209214
)
210215

211216
try:

docs/source/installation.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ Required
194194

195195
* `numpy <http://www.numpy.org>`_, versions 2.0.0 or newer.
196196

197-
* `dask <https://pypi.org/project/dask>`_, versions 2025.2.0 or newer.
197+
* `dask <https://pypi.org/project/dask>`_, version 2025.2.0 or newer up to
198+
2025.3.0 inclusive.
198199

199200
* `netCDF4 <https://pypi.org/project/netcdf4/>`_, 1.7.2 or newer.
200201

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ numpy>=2.0.0
44
cfdm>=1.12.1.0, <1.12.2.0
55
psutil>=0.6.0
66
cfunits>=3.3.7
7-
dask>=2025.2.0
7+
dask>=2025.2.0,<=2025.3.0
88
packaging>=20.0
99
scipy>=1.10.0

0 commit comments

Comments
 (0)