Skip to content

Commit a06275a

Browse files
authored
Merge pull request #867 from davidhassell/dask-test-version
Pin to `dask>=2025.5.1`
2 parents 412d862 + d34dcd8 commit a06275a

File tree

5 files changed

+52
-54
lines changed

5 files changed

+52
-54
lines changed

Changelog.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ version NEXTVERSION
55

66
* New keyword parameter to `cf.DimensionCoordinate.create_bounds`:
77
``inplace`` (https://github.com/NCAS-CMS/cf-python/issues/855)
8+
* Set new minimum version of `dask`: ``2025.5.1``
9+
(https://github.com/NCAS-CMS/cf-python/issues/866)
10+
* Changed dependency: ``dask>=2025.5.1``
811

912
----
1013

cf/__init__.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,21 +196,17 @@
196196
f"Got {psutil.__version__} at {psutil.__file__}"
197197
)
198198

199+
# Check the version of dask
199200
try:
200201
import dask
201202
except ImportError as error1:
202203
raise ImportError(_error0 + str(error1))
203204
else:
204-
_minimum_vn = "2025.2.0"
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}."
205+
_minimum_vn = "2025.5.1"
206+
if Version(dask.__version__) < Version(_minimum_vn):
207+
raise ValueError(
208+
f"Bad dask version: cf requires dask>={_minimum_vn}. "
209+
f"Got {dask.__version__} at {dask.__file__}"
214210
)
215211

216212
try:

cf/functions.py

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3187,50 +3187,50 @@ def environment(display=True, paths=True):
31873187
**Examples**
31883188
31893189
>>> cf.environment()
3190-
Platform: Linux-5.15.0-122-generic-x86_64-with-glibc2.35
3191-
HDF5 library: 1.12.2
3192-
netcdf library: 4.9.3-development
3193-
udunits2 library: /home/user/lib/libudunits2.so.0
3194-
esmpy/ESMF: 8.6.1 /home/user/lib/python3.12/site-packages/esmpy/__init__.py
3195-
Python: 3.12.2 /home/user/bin/python
3196-
dask: 2025.2.0 /home/user/lib/python3.12/site-packages/dask/__init__.py
3197-
netCDF4: 1.6.5 /home/user/lib/python3.12/site-packages/netCDF4/__init__.py
3198-
h5netcdf: 1.3.0 /home/user/lib/python3.12/site-packages/h5netcdf/__init__.py
3199-
h5py: 3.11.0 /home/user/lib/python3.12/site-packages/h5py/__init__.py
3200-
s3fs: 2024.6.0 /home/user/lib/python3.12/site-packages/s3fs/__init__.py
3201-
psutil: 5.9.8 /home/user/lib/python3.12/site-packages/psutil/__init__.py
3202-
packaging: 23.2 /home/user/lib/python3.12/site-packages/packaging/__init__.py
3203-
numpy: 1.26.4 /home/user/lib/python3.12/site-packages/numpy/__init__.py
3204-
scipy: 1.13.0 /home/user/lib/python3.12/site-packages/scipy/__init__.py
3205-
matplotlib: 3.8.4 /home/user/lib/python3.12/site-packages/matplotlib/__init__.py
3206-
cftime: 1.6.3 /home/user/lib/python3.12/site-packages/cftime/__init__.py
3207-
cfunits: 3.3.7 /home/user/lib/python3.12/site-packages/cfunits/__init__.py
3208-
cfplot: 3.3.0 /home/user/lib/python3.12/site-packages/cfplot/__init__.py
3209-
cfdm: 1.12.0.0 /home/user/cfdm/cfdm/__init__.py
3210-
cf: 3.17.0 /home/user/cf-python/cf/__init__.py
3190+
Platform: Linux-6.8.0-60-generic-x86_64-with-glibc2.39
3191+
HDF5 library: 1.14.2
3192+
netcdf library: 4.9.4-development
3193+
udunits2 library: libudunits2.so.0
3194+
esmpy/ESMF: 8.7.0 /home/miniconda/lib/python3.12/site-packages/esmpy/__init__.py
3195+
Python: 3.12.8 /home/miniconda/bin/python
3196+
dask: 2025.5.1 /home/miniconda/lib/python3.12/site-packages/dask/__init__.py
3197+
netCDF4: 1.7.2 /home/miniconda/lib/python3.12/site-packages/netCDF4/__init__.py
3198+
h5netcdf: 1.3.0 /home/miniconda/lib/python3.12/site-packages/h5netcdf/__init__.py
3199+
h5py: 3.12.1 /home/miniconda/lib/python3.12/site-packages/h5py/__init__.py
3200+
s3fs: 2024.12.0 /home/miniconda/lib/python3.12/site-packages/s3fs/__init__.py
3201+
psutil: 6.1.1 /home/miniconda/lib/python3.12/site-packages/psutil/__init__.py
3202+
packaging: 24.2 /home/miniconda/lib/python3.12/site-packages/packaging/__init__.py
3203+
numpy: 2.2.2 /home/miniconda/lib/python3.12/site-packages/numpy/__init__.py
3204+
scipy: 1.15.2 /home/miniconda/lib/python3.12/site-packages/scipy/__init__.py
3205+
matplotlib: 3.10.0 /home/miniconda/lib/python3.12/site-packages/matplotlib/__init__.py
3206+
cftime: 1.6.4.post1 /home/miniconda/lib/python3.12/site-packages/cftime/__init__.py
3207+
cfunits: 3.3.7 /home/miniconda/lib/python3.12/site-packages/cfunits/__init__.py
3208+
cfplot: 3.3.0 /home/miniconda/lib/python3.12/site-packages/cfplot/__init__.py
3209+
cfdm: 1.12.2.0 /home/miniconda/lib/python3.12/site-packages/cfdm/__init__.py
3210+
cf: NEXTVERSION /home/miniconda/lib/python3.12/site-packages/cf/__init__.py
32113211
32123212
>>> cf.environment(paths=False)
3213-
Platform: Linux-5.15.0-122-generic-x86_64-with-glibc2.35
3214-
HDF5 library: 1.12.2
3215-
netcdf library: 4.9.3-development
3216-
udunits2 library: /home/user/lib/libudunits2.so.0
3217-
esmpy/ESMF: 8.6.1
3218-
Python: 3.12.2
3219-
dask: 2025.2.0
3220-
netCDF4: 1.6.5
3213+
Platform: Linux-6.8.0-60-generic-x86_64-with-glibc2.39
3214+
HDF5 library: 1.14.2
3215+
netcdf library: 4.9.4-development
3216+
udunits2 library: libudunits2.so.0
3217+
esmpy/ESMF: 8.7.0
3218+
Python: 3.12.8
3219+
dask: 2025.5.1
3220+
netCDF4: 1.7.2
32213221
h5netcdf: 1.3.0
3222-
h5py: 3.11.0
3223-
s3fs: 2024.6.0
3224-
psutil: 5.9.8
3225-
packaging: 23.2
3226-
numpy: 1.26.4
3227-
scipy: 1.13.0
3228-
matplotlib: 3.8.4
3229-
cftime: 1.6.3
3222+
h5py: 3.12.1
3223+
s3fs: 2024.12.0
3224+
psutil: 6.1.1
3225+
packaging: 24.2
3226+
numpy: 2.2.2
3227+
scipy: 1.15.2
3228+
matplotlib: 3.10.0
3229+
cftime: 1.6.4.post1
32303230
cfunits: 3.3.7
32313231
cfplot: 3.3.0
3232-
cfdm: 1.12.0.0
3233-
cf: 3.17.0
3232+
cfdm: 1.12.2.0
3233+
cf: NEXTVERSION
32343234
32353235
"""
32363236
dependency_version_paths_mapping = {

docs/source/installation.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ Required
194194

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

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

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

@@ -204,8 +203,8 @@ Required
204203

205204
* `scipy <https://pypi.org/project/scipy>`_, version 1.10.0 or newer.
206205

207-
* `cfdm <https://pypi.org/project/cfdm/>`_, version 1.12.1.0 or up to,
208-
but not including, 1.12.2.0.
206+
* `cfdm <https://pypi.org/project/cfdm/>`_, version 1.12.2.0 or up to,
207+
but not including, 1.12.3.0.
209208

210209
* `cfunits <https://pypi.org/project/cfunits/>`_, version 3.3.7 or newer.
211210

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,<=2025.3.0
7+
dask>=2025.5.1
88
packaging>=20.0
99
scipy>=1.10.0

0 commit comments

Comments
 (0)