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

Pin dask <2024.9 #6255

Merged
merged 7 commits into from
Dec 18, 2024
Merged

Pin dask <2024.9 #6255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e51c72a
pin dask <2024.9
stephenworsley Dec 13, 2024
f388e50
Merge branch 'main' into pin_dask_slicing_bug
stephenworsley Dec 17, 2024
467c667
update lockfiles
stephenworsley Dec 17, 2024
d14a0db
Merge remote-tracking branch 'origin/pin_dask_slicing_bug' into pin_d…
stephenworsley Dec 17, 2024
c39749c
update for pypi
stephenworsley Dec 17, 2024
beb6de1
add whatsnew, fix tests
stephenworsley Dec 18, 2024
71fa550
skip failing doctests
stephenworsley Dec 18, 2024
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
3 changes: 2 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 @@ -71,7 +71,8 @@ This document explains the changes made to Iris for this release
🔗 Dependencies
===============

#. N/A
#. `@stephenworsley`_ pinned dask to <2024.9 due to an indexing bug. (:issue:`6251`,
:pull:`6255`)


📚 Documentation
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/common/resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2592,9 +2592,9 @@ def shape(self):
source 'Data from Met Office Unified Model 6.05'
>>> Resolve().shape is None
True
>>> Resolve(cube1, cube2).shape
>>> Resolve(cube1, cube2).shape # doctest: +SKIP
(240, 37, 49)
>>> Resolve(cube2, cube1).shape
>>> Resolve(cube2, cube1).shape # doctest: +SKIP
(240, 37, 49)

""" # noqa: D214, D406, D407, D410, D411
Expand Down
345 changes: 172 additions & 173 deletions requirements/locks/py310-linux-64.lock
View file
Open in desktop

Large diffs are not rendered by default.

343 changes: 171 additions & 172 deletions requirements/locks/py311-linux-64.lock
View file
Open in desktop

Large diffs are not rendered by default.

343 changes: 171 additions & 172 deletions requirements/locks/py312-linux-64.lock
View file
Open in desktop

Large diffs are not rendered by default.

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 >=2022.9.0,!=2024.8.0
- dask-core >=2022.9.0,!=2024.8.0, <2024.9
- libnetcdf !=4.9.1
- matplotlib-base >=3.5, !=3.9.1
- netcdf4
Expand Down
2 changes: 1 addition & 1 deletion requirements/py311.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 >=2022.9.0,!=2024.8.0
- dask-core >=2022.9.0,!=2024.8.0, <2024.9
- libnetcdf !=4.9.1
- matplotlib-base >=3.5, !=3.9.1
- netcdf4
Expand Down
2 changes: 1 addition & 1 deletion requirements/py312.yml
View file
Open in desktop
trexfeathers marked this conversation as resolved.
Show resolved Hide resolved
trexfeathers marked this conversation as resolved.
Show resolved Hide resolved
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 >=2022.9.0,!=2024.8.0
- dask-core >=2022.9.0,!=2024.8.0, <2024.9
- libnetcdf !=4.9.1
- matplotlib-base >=3.5, !=3.9.1
- netcdf4
Expand Down
2 changes: 1 addition & 1 deletion requirements/pypi-core.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cartopy>=0.21
cf-units>=3.1
cftime>=1.5.0
dask[array]>=2022.9.0,!=2024.8.0
dask[array]>=2022.9.0,!=2024.8.0, <2024.9
# libnetcdf!=4.9.1 (not available on PyPI)
matplotlib>=3.5
netcdf4
Expand Down
Loading