Skip to content

Commit 8b30c00

Browse files
Merge pull request #880 from sadielbartholomew/packaging-pin-distributed
Add `distributed` as required dependency with version pin
2 parents e86a848 + 9993f68 commit 8b30c00

File tree

5 files changed

+21
-1
lines changed

5 files changed

+21
-1
lines changed

Changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Version NEXTVERSION
66
* New methods to allow changing units in a chain: `cf.Field.to_units`,
77
`cf.Data.to_units`
88
(https://github.com/NCAS-CMS/cf-python/issues/874)
9+
* New dependency: ``distributed>=2025.5.1``
910

1011
----
1112

cf/__init__.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,19 @@
209209
f"Got {dask.__version__} at {dask.__file__}"
210210
)
211211

212+
try:
213+
import distributed
214+
except ImportError as error1:
215+
raise ImportError(_error0 + str(error1))
216+
else:
217+
_minimum_vn = "2025.5.1"
218+
if Version(distributed.__version__) < Version(_minimum_vn):
219+
raise ValueError(
220+
"Bad distributed version: cf requires "
221+
f"distributed>={_minimum_vn}. "
222+
f"Got {distributed.__version__} at {distributed.__file__}"
223+
)
224+
212225
try:
213226
import scipy
214227
except ImportError as error1:

cf/functions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3171,6 +3171,7 @@ def environment(display=True, paths=True):
31713171
s3fs: 2024.12.0 /home/miniconda3/lib/python3.12/site-packages/s3fs/__init__.py
31723172
scipy: 1.15.1 /home/miniconda3/lib/python3.12/site-packages/scipy/__init__.py
31733173
dask: 2025.5.1 /home/miniconda3/lib/python3.12/site-packages/dask/__init__.py
3174+
distributed: 2025.5.1 /home/miniconda3/lib/python3.12/site-packages/distributed/__init__.py
31743175
cftime: 1.6.4.post1 /home/miniconda3/lib/python3.12/site-packages/cftime/__init__.py
31753176
cfunits: 3.3.7 /home/miniconda3/lib/python3.12/site-packages/cfunits/__init__.py
31763177
cfdm: 1.12.2.0 /home/miniconda3/lib/python3.12/site-packages/cfdm/__init__.py
@@ -3196,6 +3197,7 @@ def environment(display=True, paths=True):
31963197
s3fs: 2024.12.0
31973198
scipy: 1.15.1
31983199
dask: 2025.5.1
3200+
distributed: 2025.5.1
31993201
cftime: 1.6.4.post1
32003202
cfunits: 3.3.7
32013203
cfdm: 1.12.2.0

docs/source/installation.rst

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

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

197-
* `dask <https://pypi.org/project/dask>`_, version 2025.5.1.
197+
* `dask <https://pypi.org/project/dask>`_, version 2025.5.1 or newer.
198+
199+
* `distributed <https://pypi.org/project/distributed>`_, version 2025.5.1 or
200+
newer.
198201

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

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ cfdm>=1.12.2.0, <1.12.3.0
55
psutil>=0.6.0
66
cfunits>=3.3.7
77
dask>=2025.5.1
8+
distributed>=2025.5.1
89
packaging>=20.0
910
scipy>=1.10.0

0 commit comments

Comments
 (0)