Skip to content

Commit

Permalink
[test] skip dask tests on Python 3.12+ (ray-project#46639)
Browse files Browse the repository at this point in the history
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+`.

Signed-off-by: hongchaodeng <[email protected]>
  • Loading branch information
hongchaodeng committed Jul 16, 2024
1 parent bf37180 commit 7a56377
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 3 deletions.
6 changes: 6 additions & 0 deletions python/ray/util/dask/tests/test_dask_callback.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import sys

import dask
import pytest

import ray
from ray.util.dask import ray_dask_get, RayDaskCallback

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


@pytest.fixture
def ray_start_1_cpu():
Expand Down
6 changes: 6 additions & 0 deletions python/ray/util/dask/tests/test_dask_optimization.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import sys

import dask
import dask.dataframe as dd
from dask.dataframe.shuffle import SimpleShuffleLayer
Expand All @@ -13,6 +15,10 @@
MultipleReturnSimpleShuffleLayer,
)

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


def test_rewrite_simple_shuffle_layer(ray_start_regular_shared):
npartitions = 10
Expand Down
4 changes: 4 additions & 0 deletions python/ray/util/dask/tests/test_dask_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
from ray.util.dask import disable_dask_on_ray, enable_dask_on_ray, ray_dask_get
from ray.util.dask.callbacks import ProgressBarCallback

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


@pytest.fixture
def ray_start_1_cpu():
Expand Down
3 changes: 2 additions & 1 deletion python/requirements/ml/data-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Used by CI for datasets and docs.
# https://github.com/ray-project/ray/pull/29448#discussion_r1006256498

dask[complete]==2024.6.0
dask[complete]==2022.10.1; python_version < '3.12'
dask[complete]==2024.6.0; python_version >= '3.12'
aioboto3==11.2.0
crc32c==2.3
flask_cors
Expand Down
6 changes: 4 additions & 2 deletions python/requirements_compiled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ cython==0.29.37
# via
# -r /ray/ci/../python/requirements/test-requirements.txt
# gpy
dask==2024.6.0
dask==2022.10.1; python_version < '3.12'
dask==2024.6.0; python_version >= '3.12'
# via dask
databricks-cli==0.18.0
# via mlflow
Expand Down Expand Up @@ -353,7 +354,8 @@ dill==0.3.8
# multiprocess
distlib==0.3.7
# via virtualenv
distributed==2024.6.0
distributed==2022.10.1; python_version < '3.12'
distributed==2024.6.0; python_version >= '3.12'
# via dask
dm-tree==0.1.8
# via
Expand Down

0 comments on commit 7a56377

Please sign in to comment.