FIX-#6336: pin 'pydantic<2' to fix CI (#6337)

Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
modin-project · Jul 3, 2023 · 3502cd8 · 3502cd8
1 parent f883c25
commit 3502cd8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/docs/requirements-doc.txt b/docs/requirements-doc.txt
@@ -12,7 +12,10 @@ pyyaml
 recommonmark
 sphinx<6.0.0
 sphinx-click
-ray[default]>=1.13.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
 # 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
@@ -4,7 +4,10 @@ channels:
 dependencies:
   - pandas==1.5.3
   - numpy>=1.18.5
-  - ray-default>=1.13.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
   # 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
@@ -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
@@ -2,7 +2,10 @@ pandas==1.5.3
 numpy>=1.18.5
 dask[complete]>=2.22.0
 distributed>=2.22.0
-ray[default]>=1.13.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<12 # workaround for https://github.com/modin-project/modin/issues/6072
 psutil
 fsspec

diff --git a/setup.py b/setup.py
@@ -5,7 +5,9 @@
     long_description = fh.read()
 
 dask_deps = ["dask>=2.22.0", "distributed>=2.22.0"]
-ray_deps = ["ray[default]>=1.13.0", "pyarrow"]
+# ray==2.5.0 broken: https://github.com/conda-forge/ray-packages-feedstock/issues/100
+# 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"]