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.

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

[data] Upgrade modin (and pandas) #36451

Merged
merged 1 commit into from
Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 2 deletions .buildkite/pipeline.ml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,7 @@
- cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
- DATA_PROCESSING_TESTING=1 ./ci/env/install-dependencies.sh
- ./ci/env/env_info.sh
# Todo: enable again when we upgraded modin and pandas
# - bazel test --config=ci $(./ci/run/bazel_export_options) --build_tests_only python/ray/tests/modin/...
- bazel test --config=ci $(./ci/run/bazel_export_options) --build_tests_only python/ray/tests/modin/...
# Dask tests and examples.
- bazel test --config=ci $(./ci/run/bazel_export_options) --build_tests_only --test_tag_filters=-client python/ray/util/dask/...

Expand Down
7 changes: 0 additions & 7 deletions python/ray/data/tests/test_ecosystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,6 @@ def test_to_dask_tensor_column_cast_arrow(ray_start_regular_shared):
ctx.enable_tensor_extension_casting = original


# We are currently testing with modin 0.12.1, which uses stale Ray core
# APIs. Upgrading to a later version will also update pandas, and that upgrade
# will break other tests. We skip modin until we can resolve the issues of the
# pandas upgrade.
# Todo: upgrade modin + pandas
@pytest.mark.skip("Needs modin + pandas upgrade")
@pytest.mark.skipif(sys.version_info < (3, 8), reason="requires python3.8 or higher")
def test_from_modin(ray_start_regular_shared):
import modin.pandas as mopd
Expand All @@ -132,7 +126,6 @@ def test_from_modin(ray_start_regular_shared):
assert df.equals(dfds)


@pytest.mark.skip("Needs modin + pandas upgrade")
@pytest.mark.skipif(sys.version_info < (3, 8), reason="requires python3.8 or higher")
def test_to_modin(ray_start_regular_shared):
# create two modin dataframes
Expand Down
6 changes: 0 additions & 6 deletions python/ray/data/tests/test_execution_optimizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1002,12 +1002,6 @@ def test_from_dask_e2e(ray_start_regular_shared, enable_optimizer):
_check_usage_record(["FromPandas"])


# We are currently testing with modin 0.12.1, which uses stale Ray core
# APIs. Upgrading to a later version will also update pandas, and that upgrade
# will break other tests. We skip modin until we can resolve the issues of the
# pandas upgrade.
# Todo: upgrade modin + pandas
@pytest.mark.skip("Needs modin + pandas upgrade")
@pytest.mark.skipif(sys.version_info < (3, 8), reason="requires python3.8 or higher")
def test_from_modin_e2e(ray_start_regular_shared, enable_optimizer):
import modin.pandas as mopd
Expand Down
3 changes: 1 addition & 2 deletions python/requirements/data_processing/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ aioboto3==11.0.1
crc32c==2.3
flask_cors
s3fs==2023.1.0
# Todo: Upgrade and fix pandas errors
modin==0.12.1; python_version < '3.8'
modin==0.12.1; python_version >= '3.8'
modin==0.22.2; python_version >= '3.8'
pytest-repeat
raydp>=0.0.dev0
responses==0.13.4
Expand Down
3 changes: 1 addition & 2 deletions python/requirements/ml/requirements_upstream.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ ray_lightning==0.3.0
tune-sklearn==0.4.4
xgboost_ray==0.1.15
lightgbm_ray==0.1.8
# Todo: Upgrade and fix pandas errors
modin==0.12.1; python_version < '3.8'
modin==0.12.1; python_version >= '3.8'
modin==0.22.2; python_version >= '3.8'