Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

raise dask min pin #5225

Merged
merged 3 commits into from
Mar 31, 2023
Merged

raise dask min pin #5225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55fbaca
raise dask min pin
bjlittle Mar 31, 2023
7101076
replace workaround
bjlittle Mar 31, 2023
06effa3
add whatsnew entry
bjlittle Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion docs/src/whatsnew/latest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ This document explains the changes made to Iris for this release
#. `@trexfeathers`_ moved the benchmark runner conveniences from ``noxfile.py``
to a dedicated ``benchmarks/bm_runner.py``. (:pull:`5215`)

#. `@bjlittle`_ follow-up to :pull:`4972`, enforced ``dask>=2022.09.0`` minimum
pin for first use of `dask.array.ma.empty_like`_ and replaced `@tinyendian`_
workaround. (:pull:`5225`)


.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
Expand All @@ -167,4 +171,5 @@ This document explains the changes made to Iris for this release
Whatsnew resources in alphabetical order:

.. _#ShowYourStripes: https://showyourstripes.info/s/globe/
.. _README.md: https://github.com/SciTools/iris#-----
.. _README.md: https://github.com/SciTools/iris#-----
.. _dask.array.ma.empty_like: https://docs.dask.org/en/stable/generated/dask.array.ma.empty_like.html
8 changes: 2 additions & 6 deletions lib/iris/analysis/cartography.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,12 +1244,8 @@ def rotate_winds(u_cube, v_cube, target_cs):
if apply_mask:
# Make masked arrays to accept masking.
if lazy_output:
ut_cube = ut_cube.copy(
data=da.ma.masked_array(ut_cube.core_data())
)
vt_cube = vt_cube.copy(
data=da.ma.masked_array(vt_cube.core_data())
)
ut_cube = ut_cube.copy(data=da.ma.empty_like(ut_cube.core_data()))
vt_cube = vt_cube.copy(data=da.ma.empty_like(vt_cube.core_data()))
else:
ut_cube.data = ma.asanyarray(ut_cube.data)
vt_cube.data = ma.asanyarray(vt_cube.data)
Expand Down
2 changes: 1 addition & 1 deletion requirements/py310.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- cartopy >=0.21
- cf-units >=3.1
- cftime >=1.5
- dask-core >=2.26
- dask-core >=2022.9.0
- matplotlib >=3.5
- netcdf4
- numpy >=1.19
Expand Down
2 changes: 1 addition & 1 deletion requirements/py38.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- cartopy >=0.21
- cf-units >=3.1
- cftime >=1.5
- dask-core >=2.26
- dask-core >=2022.9.0
- matplotlib >=3.5
- netcdf4
- numpy >=1.19
Expand Down
2 changes: 1 addition & 1 deletion requirements/py39.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- cartopy >=0.21
- cf-units >=3.1
- cftime >=1.5
- dask-core >=2.26
- dask-core >=2022.9.0
- matplotlib >=3.5
- netcdf4
- numpy >=1.19
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ install_requires =
cartopy>=0.21
cf-units>=3.1
cftime>=1.5.0
dask[array]>=2.26
dask[array]>=2022.9.0
matplotlib>=3.5
netcdf4
numpy>=1.19
Expand Down