From 6acd0a4c9b5d33d3c502f1109ebe337ab77cfce1 Mon Sep 17 00:00:00 2001
From: mwtian <81660174+mwtian@users.noreply.github.com>
Date: Thu, 21 Jul 2022 10:03:41 -0700
Subject: [PATCH] Allow grpcio >= 1.48 (#26765)

The previously observed Python grpc warning / logspam seems to have been fixed for grpcio >= 1.48. And users would like to upgrade beyond grpcio 1.43 for better M1 support. However, grpcio 1.48 has not been released yet, so there is still a risk this change needs to be reverted if any problem is discovered later with Ray nightly + grpcio 1.48.
---
 .buildkite/pipeline.yml              | 1 -
 python/ray/tests/test_runtime_env.py | 2 +-
 python/requirements.txt              | 2 +-
 python/setup.py                      | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 7d2de7e33..2c17055e9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -376,7 +376,6 @@
   commands:
     - cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
     - RLLIB_TESTING=1 ./ci/env/install-dependencies.sh
-    - pip install "grpcio >= 1.28.1, <= 1.43.0"
     - bazel test --config=ci --config=asan $(./ci/run/bazel_export_options)
       --config=asan-buildkite
       --test_tag_filters=-kubernetes,asan_tests
diff --git a/python/ray/tests/test_runtime_env.py b/python/ray/tests/test_runtime_env.py
index c9c1bfe2b..c78e1f153 100644
--- a/python/ray/tests/test_runtime_env.py
+++ b/python/ray/tests/test_runtime_env.py
@@ -439,7 +439,7 @@ def test_runtime_env_log_msg(
 
     good_env = runtime_env_class(pip=["requests"])
     ray.get(f.options(runtime_env=good_env).remote())
-    sources = get_log_sources(p, 5)
+    sources = get_log_sources(p, timeout=10)
     if local_env_var_enabled:
         assert "runtime_env" in sources
     else:
diff --git a/python/requirements.txt b/python/requirements.txt
index 1d99a517a..17d48c2aa 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -12,7 +12,7 @@ cloudpickle
 filelock
 frozenlist
 gpustat == 1.0.0b1
-grpcio >= 1.28.1, <= 1.43.0
+grpcio >= 1.28.1, != 1.44.*, != 1.45.*, != 1.46.*, != 1.47.*
 jsonschema
 msgpack >= 1.0.0, < 2.0.0
 numpy >= 1.16
diff --git a/python/setup.py b/python/setup.py
index 30882ddcd..d3069fa89 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -285,7 +285,7 @@ if setup_spec.type == SetupType.RAY:
         "click >= 7.0, <= 8.0.4",
         "dataclasses; python_version < '3.7'",
         "filelock",
-        "grpcio >= 1.28.1, <= 1.43.0",
+        "grpcio >= 1.28.1, != 1.44.*, != 1.45.*, != 1.46.*, != 1.47.*",
         "jsonschema",
         "msgpack >= 1.0.0, < 2.0.0",
         "numpy >= 1.16; python_version < '3.9'",