From 43a574d1ae049ce92a6e619785d16bf7367d6562 Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Fri, 12 Jun 2020 12:59:26 -0700
Subject: [PATCH 1/2] Trust google-auth library will handle their dependency
 properly

---
 requirements.bazel.txt                         | 4 +---
 requirements.txt                               | 2 --
 src/python/grpcio_tests/setup.py               | 2 +-
 tools/run_tests/helper_scripts/build_python.sh | 7 ++-----
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/requirements.bazel.txt b/requirements.bazel.txt
index 0e2ecbe0907..10b47550f99 100644
--- a/requirements.bazel.txt
+++ b/requirements.bazel.txt
@@ -6,7 +6,7 @@ protobuf>=3.5.0.post1
 six>=1.10
 wheel>=0.29
 futures>=2.2.0
-google-auth>=1.17.1
+google-auth>=1.17.2
 oauth2client==4.1.0
 requests>=2.14.2
 urllib3>=1.23
@@ -14,5 +14,3 @@ chardet==3.0.4
 certifi==2017.4.17
 idna==2.7
 googleapis-common-protos==1.5.5
-# rsa 4.3 is the last version support Python 2
-rsa==4.3
diff --git a/requirements.txt b/requirements.txt
index 773e2c7c79b..27dd7d9f63b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,3 @@ enum34>=1.0.4
 protobuf>=3.5.0.post1
 six>=1.10
 wheel>=0.29
-# rsa 4.3 is the last version support Python 2
-rsa==4.3
diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py
index 67d22fd7148..6c1ed2f25b9 100644
--- a/src/python/grpcio_tests/setup.py
+++ b/src/python/grpcio_tests/setup.py
@@ -44,7 +44,7 @@ INSTALL_REQUIRES = (
     'grpcio-tools>={version}'.format(version=grpc_version.VERSION),
     'grpcio-health-checking>={version}'.format(version=grpc_version.VERSION),
     'oauth2client>=1.4.7', 'protobuf>=3.6.0', 'six>=1.10',
-    'google-auth>=1.17.1', 'requests>=2.14.2')
+    'google-auth>=1.17.2', 'requests>=2.14.2')
 
 if not PY3:
     INSTALL_REQUIRES += ('futures>=2.2.0',)
diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh
index 699aa849972..25efd7170ee 100755
--- a/tools/run_tests/helper_scripts/build_python.sh
+++ b/tools/run_tests/helper_scripts/build_python.sh
@@ -222,13 +222,10 @@ pip_install_dir "$ROOT/src/python/grpcio_status"
 # Install testing
 pip_install_dir "$ROOT/src/python/grpcio_testing"
 
-# rsa 4.3 is the latest version support Python 2
-pip_install rsa==4.3
-
 # Build/install tests
 pip_install coverage==4.4 oauth2client==4.1.0 \
-            google-auth==1.17.1 requests==2.14.2 \
-            googleapis-common-protos==1.5.5
+            google-auth>=1.17.2 requests==2.14.2 \
+            googleapis-common-protos>=1.5.5
 $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" preprocess
 $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" build_package_protos
 pip_install_dir "$ROOT/src/python/grpcio_tests"

From 18054754c5d85213bba6f8c77bb3587bcc1b7dc4 Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Mon, 15 Jun 2020 14:19:54 -0700
Subject: [PATCH 2/2] Install rsa==4.0 to avoid the egg cache race issue

---
 tools/run_tests/helper_scripts/build_python.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh
index 25efd7170ee..60031fa6e95 100755
--- a/tools/run_tests/helper_scripts/build_python.sh
+++ b/tools/run_tests/helper_scripts/build_python.sh
@@ -225,7 +225,7 @@ pip_install_dir "$ROOT/src/python/grpcio_testing"
 # Build/install tests
 pip_install coverage==4.4 oauth2client==4.1.0 \
             google-auth>=1.17.2 requests==2.14.2 \
-            googleapis-common-protos>=1.5.5
+            googleapis-common-protos>=1.5.5 rsa==4.0
 $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" preprocess
 $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" build_package_protos
 pip_install_dir "$ROOT/src/python/grpcio_tests"