feat: Update ray extras installation in setup.py for Ray 2.9.3

PiperOrigin-RevId: 611334927
googleapis · Feb 29, 2024 · d947304 · d947304
1 parent e048e3a
commit d947304
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -97,13 +97,13 @@
 ]
 
 ray_extra_require = [
-    # Ray's dependency version must be kept in sync with what Cluster supports.
-    "ray[default] >= 2.4, < 2.5; python_version<'3.11'",
+    # Cluster only supports 2.4.0 and 2.9.3
+    "ray[default] >= 2.4, <= 2.9.3,!= 2.5.*,!= 2.6.*,!= 2.7.*,!= 2.8.*,!=2.9.0,!=2.9.1,!=2.9.2; python_version<'3.11'",
     # Ray Data v2.4 in Python 3.11 is broken, but got fixed in Ray v2.5.
-    "ray[default] >= 2.5, < 2.5.1; python_version>='3.11'",
+    "ray[default] >= 2.5, <= 2.9.3; python_version>='3.11'",
     "google-cloud-bigquery-storage",
     "google-cloud-bigquery",
-    "pandas >= 1.0.0",
+    "pandas >= 1.0.0, < 2.2.0",
     "pyarrow >= 6.0.1",
     # Workaround for https://github.com/ray-project/ray/issues/36990.
     # TODO(b/295406381): Remove this pin when we drop support of ray<=2.5.

diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt
@@ -10,3 +10,4 @@ packaging==20.0 # Increased for compatibility with MLFlow
 grpcio-testing==1.34.0
 mlflow==1.30.1 # Pinned to speed up installation
 pytest-xdist==3.3.1 # Pinned to unbreak unit tests
+ray==2.4.0 # Pinned until 2.9.3 is verified for Ray tests
diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt
@@ -7,3 +7,4 @@ protobuf
 mock==4.0.2
 google-cloud-storage==2.2.1 # Increased for kfp 2.0 compatibility
 pytest-xdist==3.3.1 # Pinned to unbreak unit tests
+ray==2.5.0 # Pinned until 2.9.3 is verified for Ray tests
diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt
@@ -11,3 +11,4 @@ google-cloud-storage==2.2.1 # Increased for kfp 2.0 compatibility
 packaging==20.0 # Increased for compatibility with MLFlow
 grpcio-testing==1.34.0
 pytest-xdist==3.3.1 # Pinned to unbreak unit tests
+ray==2.4.0 # Pinned until 2.9.3 is verified for Ray tests
diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt
@@ -9,3 +9,4 @@ google-cloud-storage==2.2.1 # Increased for kfp 2.0 compatibility
 packaging==20.0 # Increased for compatibility with MLFlow
 grpcio-testing==1.34.0
 pytest-xdist==3.3.1 # Pinned to unbreak unit tests
+ray==2.4.0 # Pinned until 2.9.3 is verified for Ray tests