diff --git a/docs/requirements-doc.txt b/docs/requirements-doc.txt index 8832b1e478a..620f8a7a560 100644 --- a/docs/requirements-doc.txt +++ b/docs/requirements-doc.txt @@ -14,6 +14,8 @@ sphinx<6.0.0 sphinx-click # ray==2.5.0 broken: https://github.com/conda-forge/ray-packages-feedstock/issues/100 ray[default]>=1.13.0,!=2.5.0 +# https://github.com/modin-project/modin/issues/6336 +pydantic<2 # Override to latest version of modin-spreadsheet git+https://github.com/modin-project/modin-spreadsheet.git@49ffd89f683f54c311867d602c55443fb11bf2a5 sphinxcontrib_plantuml diff --git a/environment-dev.yml b/environment-dev.yml index ca52f4d3509..4b22209cbff 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -6,6 +6,8 @@ dependencies: - numpy>=1.18.5 # ray==2.5.0 broken: https://github.com/conda-forge/ray-packages-feedstock/issues/100 - ray-default>=1.13.0,!=2.5.0 + # https://github.com/modin-project/modin/issues/6336 + - pydantic<2 - pyarrow # workaround for https://github.com/conda/conda/issues/11744 - grpcio!=1.45.* diff --git a/examples/tutorial/jupyter/execution/pandas_on_ray/requirements.txt b/examples/tutorial/jupyter/execution/pandas_on_ray/requirements.txt index 8cc9c67fb3b..d19ba10cd43 100644 --- a/examples/tutorial/jupyter/execution/pandas_on_ray/requirements.txt +++ b/examples/tutorial/jupyter/execution/pandas_on_ray/requirements.txt @@ -3,4 +3,6 @@ jupyterlab ipywidgets tqdm modin[ray] +# https://github.com/modin-project/modin/issues/6336 +pydantic<2 modin[spreadsheet] diff --git a/requirements-dev.txt b/requirements-dev.txt index d4e5d7c2e46..7d56bcd71da 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,6 +4,8 @@ dask[complete]>=2.22.0 distributed>=2.22.0 # ray==2.5.0 broken: https://github.com/conda-forge/ray-packages-feedstock/issues/100 ray[default]>=1.13.0,!=2.5.0 +# https://github.com/modin-project/modin/issues/6336 +pydantic<2 pyarrow psutil fsspec diff --git a/setup.py b/setup.py index 3b30125ffe9..43d67ee1fb7 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,8 @@ dask_deps = ["dask>=2.22.0", "distributed>=2.22.0"] # ray==2.5.0 broken: https://github.com/conda-forge/ray-packages-feedstock/issues/100 -ray_deps = ["ray[default]>=1.13.0,!=2.5.0", "pyarrow"] +# pydantic<2: https://github.com/modin-project/modin/issues/6336 +ray_deps = ["ray[default]>=1.13.0,!=2.5.0", "pyarrow", "pydantic<2"] unidist_deps = ["unidist[mpi]>=0.2.1"] remote_deps = ["rpyc==4.1.5", "cloudpickle", "boto3"] spreadsheet_deps = ["modin-spreadsheet>=0.1.0"]