Skip to content

Commit 193315b

Browse files
authored
[test] skip dask tests on Python 3.12+ (#46639) (#46648)
dask has to be upgraded to `2024.6.0` for successful builds. But on Ray side, we don't have any plan to support dask version later than `2022.10.1`. So we will keep dask as is for `<= Python 3.11`, and skip dask tests on `Python 3.12+`. ref: #46641 <!-- Thank you for your contribution! Please review https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before opening a pull request. --> <!-- Please add a reviewer to the assignee section when you create a PR. If you don't have the access to it, we will shortly find a reviewer and assign them to your PR. --> ## Why are these changes needed? <!-- Please give a short summary of the change and the problem this solves. --> ## Related issue number <!-- For example: "Closes #1234" --> ## Checks - [ ] I've signed off every commit(by using the -s flag, i.e., `git commit -s`) in this PR. - [ ] I've run `scripts/format.sh` to lint the changes in this PR. - [ ] I've included any doc changes needed for https://docs.ray.io/en/master/. - [ ] I've added any new APIs to the API Reference. For example, if I added a method in Tune, I've added it in `doc/source/tune/api/` under the corresponding `.rst` file. - [ ] I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/ - Testing Strategy - [ ] Unit tests - [ ] Release tests - [ ] This PR is not tested :( Signed-off-by: hongchaodeng <hongchaodeng1@gmail.com>
1 parent bf37180 commit 193315b

File tree

5 files changed

+22
-3
lines changed

5 files changed

+22
-3
lines changed

python/ray/util/dask/tests/test_dask_callback.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
import sys
2+
13
import dask
24
import pytest
35

46
import ray
57
from ray.util.dask import ray_dask_get, RayDaskCallback
68

9+
pytestmark = pytest.mark.skipif(
10+
sys.version_info >= (3, 12), reason="Skip dask tests for Python version 3.12+"
11+
)
12+
713

814
@pytest.fixture
915
def ray_start_1_cpu():

python/ray/util/dask/tests/test_dask_optimization.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import sys
2+
13
import dask
24
import dask.dataframe as dd
35
from dask.dataframe.shuffle import SimpleShuffleLayer
@@ -13,6 +15,10 @@
1315
MultipleReturnSimpleShuffleLayer,
1416
)
1517

18+
pytestmark = pytest.mark.skipif(
19+
sys.version_info >= (3, 12), reason="Skip dask tests for Python version 3.12+"
20+
)
21+
1622

1723
def test_rewrite_simple_shuffle_layer(ray_start_regular_shared):
1824
npartitions = 10

python/ray/util/dask/tests/test_dask_scheduler.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
from ray.util.dask import disable_dask_on_ray, enable_dask_on_ray, ray_dask_get
1515
from ray.util.dask.callbacks import ProgressBarCallback
1616

17+
pytestmark = pytest.mark.skipif(
18+
sys.version_info >= (3, 12), reason="Skip dask tests for Python version 3.12+"
19+
)
20+
1721

1822
@pytest.fixture
1923
def ray_start_1_cpu():

python/requirements/ml/data-requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Used by CI for datasets and docs.
22
# https://github.com/ray-project/ray/pull/29448#discussion_r1006256498
33

4-
dask[complete]==2024.6.0
4+
dask[complete]==2022.10.1; python_version < '3.12'
5+
dask[complete]==2024.6.0; python_version >= '3.12'
56
aioboto3==11.2.0
67
crc32c==2.3
78
flask_cors

python/requirements_compiled.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@ cython==0.29.37
323323
# via
324324
# -r /ray/ci/../python/requirements/test-requirements.txt
325325
# gpy
326-
dask==2024.6.0
326+
dask==2022.10.1; python_version < '3.12'
327+
dask==2024.6.0; python_version >= '3.12'
327328
# via dask
328329
databricks-cli==0.18.0
329330
# via mlflow
@@ -353,7 +354,8 @@ dill==0.3.8
353354
# multiprocess
354355
distlib==0.3.7
355356
# via virtualenv
356-
distributed==2024.6.0
357+
distributed==2022.10.1; python_version < '3.12'
358+
distributed==2024.6.0; python_version >= '3.12'
357359
# via dask
358360
dm-tree==0.1.8
359361
# via

0 commit comments

Comments
 (0)