From d34dcd8f4c5116286c343001f06c03c2ece5858a Mon Sep 17 00:00:00 2001 From: David Hassell Date: Tue, 27 May 2025 10:51:06 +0100 Subject: [PATCH] Pin dask>=2025.5.1 --- Changelog.rst | 3 ++ cf/__init__.py | 16 +++----- cf/functions.py | 78 ++++++++++++++++++------------------ docs/source/installation.rst | 7 ++-- requirements.txt | 2 +- 5 files changed, 52 insertions(+), 54 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index 13bddcb81b..84b22ea529 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -5,6 +5,9 @@ version NEXTVERSION * New keyword parameter to `cf.DimensionCoordinate.create_bounds`: ``inplace`` (https://github.com/NCAS-CMS/cf-python/issues/855) +* Set new minimum version of `dask`: ``2025.5.1`` + (https://github.com/NCAS-CMS/cf-python/issues/866) +* Changed dependency: ``dask>=2025.5.1`` ---- diff --git a/cf/__init__.py b/cf/__init__.py index ae86fe4eff..38225cbe41 100644 --- a/cf/__init__.py +++ b/cf/__init__.py @@ -196,21 +196,17 @@ f"Got {psutil.__version__} at {psutil.__file__}" ) +# Check the version of dask try: import dask except ImportError as error1: raise ImportError(_error0 + str(error1)) else: - _minimum_vn = "2025.2.0" - # Note in this case max is inclusive, change inequalities if this changes - _maximum_vn = "2025.3.0" - _dask_version = Version(dask.__version__) - if _dask_version < Version(_minimum_vn) or _dask_version > Version( - _maximum_vn - ): - raise RuntimeError( - "Bad dask version: cf requires " - f"{_minimum_vn}<=dask<={_maximum_vn}. Got {_dask_version}." + _minimum_vn = "2025.5.1" + if Version(dask.__version__) < Version(_minimum_vn): + raise ValueError( + f"Bad dask version: cf requires dask>={_minimum_vn}. " + f"Got {dask.__version__} at {dask.__file__}" ) try: diff --git a/cf/functions.py b/cf/functions.py index cacfef4321..2018a5d9ff 100644 --- a/cf/functions.py +++ b/cf/functions.py @@ -3187,50 +3187,50 @@ def environment(display=True, paths=True): **Examples** >>> cf.environment() - Platform: Linux-5.15.0-122-generic-x86_64-with-glibc2.35 - HDF5 library: 1.12.2 - netcdf library: 4.9.3-development - udunits2 library: /home/user/lib/libudunits2.so.0 - esmpy/ESMF: 8.6.1 /home/user/lib/python3.12/site-packages/esmpy/__init__.py - Python: 3.12.2 /home/user/bin/python - dask: 2025.2.0 /home/user/lib/python3.12/site-packages/dask/__init__.py - netCDF4: 1.6.5 /home/user/lib/python3.12/site-packages/netCDF4/__init__.py - h5netcdf: 1.3.0 /home/user/lib/python3.12/site-packages/h5netcdf/__init__.py - h5py: 3.11.0 /home/user/lib/python3.12/site-packages/h5py/__init__.py - s3fs: 2024.6.0 /home/user/lib/python3.12/site-packages/s3fs/__init__.py - psutil: 5.9.8 /home/user/lib/python3.12/site-packages/psutil/__init__.py - packaging: 23.2 /home/user/lib/python3.12/site-packages/packaging/__init__.py - numpy: 1.26.4 /home/user/lib/python3.12/site-packages/numpy/__init__.py - scipy: 1.13.0 /home/user/lib/python3.12/site-packages/scipy/__init__.py - matplotlib: 3.8.4 /home/user/lib/python3.12/site-packages/matplotlib/__init__.py - cftime: 1.6.3 /home/user/lib/python3.12/site-packages/cftime/__init__.py - cfunits: 3.3.7 /home/user/lib/python3.12/site-packages/cfunits/__init__.py - cfplot: 3.3.0 /home/user/lib/python3.12/site-packages/cfplot/__init__.py - cfdm: 1.12.0.0 /home/user/cfdm/cfdm/__init__.py - cf: 3.17.0 /home/user/cf-python/cf/__init__.py + Platform: Linux-6.8.0-60-generic-x86_64-with-glibc2.39 + HDF5 library: 1.14.2 + netcdf library: 4.9.4-development + udunits2 library: libudunits2.so.0 + esmpy/ESMF: 8.7.0 /home/miniconda/lib/python3.12/site-packages/esmpy/__init__.py + Python: 3.12.8 /home/miniconda/bin/python + dask: 2025.5.1 /home/miniconda/lib/python3.12/site-packages/dask/__init__.py + netCDF4: 1.7.2 /home/miniconda/lib/python3.12/site-packages/netCDF4/__init__.py + h5netcdf: 1.3.0 /home/miniconda/lib/python3.12/site-packages/h5netcdf/__init__.py + h5py: 3.12.1 /home/miniconda/lib/python3.12/site-packages/h5py/__init__.py + s3fs: 2024.12.0 /home/miniconda/lib/python3.12/site-packages/s3fs/__init__.py + psutil: 6.1.1 /home/miniconda/lib/python3.12/site-packages/psutil/__init__.py + packaging: 24.2 /home/miniconda/lib/python3.12/site-packages/packaging/__init__.py + numpy: 2.2.2 /home/miniconda/lib/python3.12/site-packages/numpy/__init__.py + scipy: 1.15.2 /home/miniconda/lib/python3.12/site-packages/scipy/__init__.py + matplotlib: 3.10.0 /home/miniconda/lib/python3.12/site-packages/matplotlib/__init__.py + cftime: 1.6.4.post1 /home/miniconda/lib/python3.12/site-packages/cftime/__init__.py + cfunits: 3.3.7 /home/miniconda/lib/python3.12/site-packages/cfunits/__init__.py + cfplot: 3.3.0 /home/miniconda/lib/python3.12/site-packages/cfplot/__init__.py + cfdm: 1.12.2.0 /home/miniconda/lib/python3.12/site-packages/cfdm/__init__.py + cf: NEXTVERSION /home/miniconda/lib/python3.12/site-packages/cf/__init__.py >>> cf.environment(paths=False) - Platform: Linux-5.15.0-122-generic-x86_64-with-glibc2.35 - HDF5 library: 1.12.2 - netcdf library: 4.9.3-development - udunits2 library: /home/user/lib/libudunits2.so.0 - esmpy/ESMF: 8.6.1 - Python: 3.12.2 - dask: 2025.2.0 - netCDF4: 1.6.5 + Platform: Linux-6.8.0-60-generic-x86_64-with-glibc2.39 + HDF5 library: 1.14.2 + netcdf library: 4.9.4-development + udunits2 library: libudunits2.so.0 + esmpy/ESMF: 8.7.0 + Python: 3.12.8 + dask: 2025.5.1 + netCDF4: 1.7.2 h5netcdf: 1.3.0 - h5py: 3.11.0 - s3fs: 2024.6.0 - psutil: 5.9.8 - packaging: 23.2 - numpy: 1.26.4 - scipy: 1.13.0 - matplotlib: 3.8.4 - cftime: 1.6.3 + h5py: 3.12.1 + s3fs: 2024.12.0 + psutil: 6.1.1 + packaging: 24.2 + numpy: 2.2.2 + scipy: 1.15.2 + matplotlib: 3.10.0 + cftime: 1.6.4.post1 cfunits: 3.3.7 cfplot: 3.3.0 - cfdm: 1.12.0.0 - cf: 3.17.0 + cfdm: 1.12.2.0 + cf: NEXTVERSION """ dependency_version_paths_mapping = { diff --git a/docs/source/installation.rst b/docs/source/installation.rst index ac4d03eca9..e9e6cf2e15 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -194,8 +194,7 @@ Required * `numpy `_, versions 2.0.0 or newer. -* `dask `_, version 2025.2.0 or newer up to - 2025.3.0 inclusive. +* `dask `_, version 2025.5.1. * `netCDF4 `_, 1.7.2 or newer. @@ -204,8 +203,8 @@ Required * `scipy `_, version 1.10.0 or newer. -* `cfdm `_, version 1.12.1.0 or up to, - but not including, 1.12.2.0. +* `cfdm `_, version 1.12.2.0 or up to, + but not including, 1.12.3.0. * `cfunits `_, version 3.3.7 or newer. diff --git a/requirements.txt b/requirements.txt index 9f1b57adbb..9d875bb541 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ numpy>=2.0.0 cfdm>=1.12.1.0, <1.12.2.0 psutil>=0.6.0 cfunits>=3.3.7 -dask>=2025.2.0,<=2025.3.0 +dask>=2025.5.1 packaging>=20.0 scipy>=1.10.0