From e242764d50d085d0a05494ccf01b314af52a518b Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Tue, 29 Sep 2020 15:17:38 -0700
Subject: [PATCH] Remove enum34 from requirements.txt

---
 requirements.txt                                   | 1 -
 src/python/grpcio_tests/setup.py                   | 5 ++---
 tools/run_tests/artifacts/build_artifact_python.sh | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 00d91d3c13d..5d8840e8863 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 # GRPC Python setup requirements
 coverage>=4.0
 cython>=0.29.8
-enum34>=1.0.4
 protobuf>=3.5.0.post1, < 4.0dev
 six>=1.10
 wheel>=0.29
diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py
index 81890a1a202..87cccda425b 100644
--- a/src/python/grpcio_tests/setup.py
+++ b/src/python/grpcio_tests/setup.py
@@ -38,8 +38,7 @@ PACKAGE_DIRECTORIES = {
 }
 
 INSTALL_REQUIRES = (
-    'coverage>=4.0', 'enum34>=1.0.4',
-    'grpcio>={version}'.format(version=grpc_version.VERSION),
+    'coverage>=4.0', 'grpcio>={version}'.format(version=grpc_version.VERSION),
     'grpcio-channelz>={version}'.format(version=grpc_version.VERSION),
     'grpcio-status>={version}'.format(version=grpc_version.VERSION),
     'grpcio-tools>={version}'.format(version=grpc_version.VERSION),
@@ -48,7 +47,7 @@ INSTALL_REQUIRES = (
     'google-auth>=1.17.2', 'requests>=2.14.2')
 
 if not PY3:
-    INSTALL_REQUIRES += ('futures>=2.2.0',)
+    INSTALL_REQUIRES += ('futures>=2.2.0', 'enum34>=1.0.4')
 
 COMMAND_CLASS = {
     # Run `preprocess` *before* doing any packaging!
diff --git a/tools/run_tests/artifacts/build_artifact_python.sh b/tools/run_tests/artifacts/build_artifact_python.sh
index abd6900152c..91f21885b8d 100755
--- a/tools/run_tests/artifacts/build_artifact_python.sh
+++ b/tools/run_tests/artifacts/build_artifact_python.sh
@@ -104,7 +104,7 @@ then
 
   if [ "$("$PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ]
   then
-    "${PIP}" install futures>=2.2.0
+    "${PIP}" install futures>=2.2.0 enum>=1.0.4
   fi
 
   "${PIP}" install grpcio --no-index --find-links "file://$ARTIFACT_DIR/"