From c70411195634359fbd74761c014074433a1b6065 Mon Sep 17 00:00:00 2001 From: David Hassell Date: Mon, 17 Feb 2025 16:11:56 +0000 Subject: [PATCH 1/5] dev --- Changelog.rst | 3 ++- cf/__init__.py | 12 +++--------- docs/source/installation.rst | 4 ++-- requirements.txt | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index c4f2c43a91..2dbb2b8c2b 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -6,6 +6,7 @@ version 3.17.0 * Replace dataset aggregation functionality (CFA) with that imported from `cfdm` (https://github.com/NCAS-CMS/cf-python/issues/841) * Changed dependency: ``1.12.0.0<=cfdm<1.12.1.0`` +* Changed dependency: ``dask>=2025.12.0`` ---- @@ -53,7 +54,7 @@ version 3.16.3 global or near-global cyclic subspaces (https://github.com/NCAS-CMS/cf-python/issues/828) * New dependency: ``h5netcdf>=1.3.0`` -* New dependency: ``h5py>=3.10.0`` +* New dependency: ``h5py>=3.12.0`` * New dependency: ``s3fs>=2024.6.0`` * Changed dependency: ``numpy>=1.15,<2.0`` * Changed dependency: ``1.11.2.0<=cfdm<1.11.3.0`` diff --git a/cf/__init__.py b/cf/__init__.py index 39460f3f14..c6a4aa53ed 100644 --- a/cf/__init__.py +++ b/cf/__init__.py @@ -215,16 +215,10 @@ ) # Check the version of dask - -_minimum_vn = "2024.6.1" -_maximum_vn = "2024.7.1" -if ( - not Version(_minimum_vn) - <= Version(dask.__version__) - <= Version(_maximum_vn) -): +_minimum_vn = "2024.12.0" +if Version(dask.__version__) < Version(_minimum_vn): raise ValueError( - "Bad dask version: cf requires {_minimum_vn}<=dask<={_maximum_vn}. " + f"Bad dask version: cf requires dask>={_minimum_vn}. " f"Got {dask.__version__} at {dask.__file__}" ) diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 505d3578b9..053cc96db6 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -195,8 +195,8 @@ Required * `numpy `_, versions 1.15 up to, but not including, 2.0. -* `dask `_, versions 2024.6.0 to - 2024.7.1 inclusive. +* `dask `_, versions 2024.12.0 or + newer. * `netCDF4 `_, 1.6.5 or newer. diff --git a/requirements.txt b/requirements.txt index b03e630983..b734dc036b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ numpy>=2.0.0 cfdm>=1.12.0.0, <1.12.1.0 psutil>=0.6.0 cfunits>=3.3.7 -dask>=2024.6.0,<=2024.7.1 +dask>=2025.12.0 packaging>=20.0 scipy>=1.10.0 h5netcdf>=1.3.0 From a6a3838fde58c24074fba84772101b438e6b40e1 Mon Sep 17 00:00:00 2001 From: David Hassell Date: Mon, 24 Feb 2025 16:25:15 +0000 Subject: [PATCH 2/5] dev --- Changelog.rst | 4 +++- docs/source/installation.rst | 3 +-- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index ca3e78c05e..920d1c4df6 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -10,7 +10,9 @@ version 3.17.0 * Changed dependency: ``Python>=3.9.0`` * Changed dependency: ``numpy>=2.0.0`` * Changed dependency: ``cfdm>=1.12.0.0, <1.12.1.0`` -* Changed dependency: ``dask>=2024.12.0`` +* Changed dependency: ``dask>=2025.2.0`` +* Changed dependency: ``netCDF4>=1.7.2`` +* Changed dependency: ``cftime>=1.6.4`` * Changed optional dependency: ``esmpy>=8.7.0`` * Removed dependency (now incorporated into ``cfdm``): ``h5py`` * Removed dependency (now incorporated into ``cfdm``): ``h5netcdf`` diff --git a/docs/source/installation.rst b/docs/source/installation.rst index fb6c25d2f9..a89b1cf677 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -194,8 +194,7 @@ Required * `numpy `_, versions 2.0.0 or newer. -* `dask `_, versions 2024.12.0 or - newer. +* `dask `_, versions 2025.2.0 or newer. * `netCDF4 `_, 1.7.2 or newer. diff --git a/requirements.txt b/requirements.txt index 0e5cd2fbba..603bf3343a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ numpy>=2.0.0 cfdm>=1.12.0.0, <1.12.1.0 psutil>=0.6.0 cfunits>=3.3.7 -dask>=2025.12.0 +dask>=2025.2.0 packaging>=20.0 scipy>=1.10.0 From 30d8e0d70a6c44f13d7cd9cd3da38f0ac472192a Mon Sep 17 00:00:00 2001 From: David Hassell Date: Mon, 3 Mar 2025 10:37:14 +0000 Subject: [PATCH 3/5] dev --- Changelog.rst | 4 +--- cf/__init__.py | 5 ++--- docs/source/releases.rst | 6 ++++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index 3c47d64233..0b7cd66268 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -28,7 +28,7 @@ version 3.16.3 **2025-01-28** -* Implementationof active storage reduction operations +* Implementation of active storage reduction operations (https://github.com/NCAS-CMS/cf-python/issues/501) * Allow ``'nearest_dtos'`` 2-d regridding to work with discrete sampling geometry source grids @@ -48,8 +48,6 @@ version 3.16.3 (https://github.com/NCAS-CMS/cf-python/issues/712) * New class `cf.H5netcdfArray` * New class `cf.NetCDF4Array` -* New class `cf.CFAH5netcdfArray` -* New class `cf.CFANetCDF4Array` * Replace core `dask` functionality with that imported from `cfdm` (https://github.com/NCAS-CMS/cf-python/issues/839) * Fix bug that sometimes puts an incorrect ``radian-1`` or diff --git a/cf/__init__.py b/cf/__init__.py index 1ab7a0544f..7055c6f2cc 100644 --- a/cf/__init__.py +++ b/cf/__init__.py @@ -124,9 +124,8 @@ _minimum_vn = "1.12.0.0" _maximum_vn = "1.12.1.0" _cfdm_version = Version(cfdm.__version__) - if ( - _cfdm_version < Version(_minimum_vn) or - _cfdm_version >= Version(_maximum_vn) + if _cfdm_version < Version(_minimum_vn) or _cfdm_version >= Version( + _maximum_vn ): raise RuntimeError( "Bad cfdm version: cf requires " diff --git a/docs/source/releases.rst b/docs/source/releases.rst index 73e1c3f23b..f2a66faab2 100644 --- a/docs/source/releases.rst +++ b/docs/source/releases.rst @@ -13,9 +13,15 @@ Documentation for all versions of cf. :local: :backlinks: entry +**CF-1.12** +----------- + +* `Version 3.17.0 `_ (2025-03-??) + **CF-1.11** ----------- +* `Version 3.16.3 `_ (2025-01-28) * `Version 3.16.2 `_ (2024-04-26) * `Version 3.16.1 `_ (2024-03-01) * `Version 3.16.0 `_ (2023-12-06) From e79aea64d1fdef74d2f0ebf3a21f7ca8c0778cbb Mon Sep 17 00:00:00 2001 From: David Hassell Date: Mon, 3 Mar 2025 11:09:23 +0000 Subject: [PATCH 4/5] dev --- Changelog.rst | 4 +++- cf/__init__.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index 92b2e97dff..ee656f4e16 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -1,8 +1,10 @@ version 3.17.0 -------------- -**2025-??-??** +**2025-03-??** +* Set new minimum version of `dask`: ``2025.2.0`` + (https://github.com/NCAS-CMS/cf-python/849) * Set a new minimum version of `numpy`: ``2.0.0`` (https://github.com/NCAS-CMS/cf-python/issues/843) * Replace dataset aggregation functionality (CFA) with that imported diff --git a/cf/__init__.py b/cf/__init__.py index 7055c6f2cc..c6d5af14eb 100644 --- a/cf/__init__.py +++ b/cf/__init__.py @@ -80,8 +80,8 @@ """ -__date__ = "2025-01-28" -__version__ = "3.16.3" +__date__ = "2025-03-??" +__version__ = "3.17.0" _requires = ( "numpy", From 1b32d6282b2a9ade2f2bb8927a4d9026fa14c7fb Mon Sep 17 00:00:00 2001 From: David Hassell Date: Tue, 4 Mar 2025 17:33:27 +0000 Subject: [PATCH 5/5] Typo Co-authored-by: Sadie L. Bartholomew --- Changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.rst b/Changelog.rst index ee656f4e16..3321871d8f 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -4,7 +4,7 @@ version 3.17.0 **2025-03-??** * Set new minimum version of `dask`: ``2025.2.0`` - (https://github.com/NCAS-CMS/cf-python/849) + (https://github.com/NCAS-CMS/cf-python/issues/849) * Set a new minimum version of `numpy`: ``2.0.0`` (https://github.com/NCAS-CMS/cf-python/issues/843) * Replace dataset aggregation functionality (CFA) with that imported