Remove enum34 from requirements.txt

pull/24267/head
Lidi Zheng 4 years ago
parent cbcb89610c
commit e242764d50
  1. 1
      requirements.txt
  2. 5
      src/python/grpcio_tests/setup.py
  3. 2
      tools/run_tests/artifacts/build_artifact_python.sh

@ -1,7 +1,6 @@
# GRPC Python setup requirements # GRPC Python setup requirements
coverage>=4.0 coverage>=4.0
cython>=0.29.8 cython>=0.29.8
enum34>=1.0.4
protobuf>=3.5.0.post1, < 4.0dev protobuf>=3.5.0.post1, < 4.0dev
six>=1.10 six>=1.10
wheel>=0.29 wheel>=0.29

@ -38,8 +38,7 @@ PACKAGE_DIRECTORIES = {
} }
INSTALL_REQUIRES = ( INSTALL_REQUIRES = (
'coverage>=4.0', 'enum34>=1.0.4', 'coverage>=4.0', 'grpcio>={version}'.format(version=grpc_version.VERSION),
'grpcio>={version}'.format(version=grpc_version.VERSION),
'grpcio-channelz>={version}'.format(version=grpc_version.VERSION), 'grpcio-channelz>={version}'.format(version=grpc_version.VERSION),
'grpcio-status>={version}'.format(version=grpc_version.VERSION), 'grpcio-status>={version}'.format(version=grpc_version.VERSION),
'grpcio-tools>={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') 'google-auth>=1.17.2', 'requests>=2.14.2')
if not PY3: if not PY3:
INSTALL_REQUIRES += ('futures>=2.2.0',) INSTALL_REQUIRES += ('futures>=2.2.0', 'enum34>=1.0.4')
COMMAND_CLASS = { COMMAND_CLASS = {
# Run `preprocess` *before* doing any packaging! # Run `preprocess` *before* doing any packaging!

@ -104,7 +104,7 @@ then
if [ "$("$PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ] if [ "$("$PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ]
then then
"${PIP}" install futures>=2.2.0 "${PIP}" install futures>=2.2.0 enum>=1.0.4
fi fi
"${PIP}" install grpcio --no-index --find-links "file://$ARTIFACT_DIR/" "${PIP}" install grpcio --no-index --find-links "file://$ARTIFACT_DIR/"

Loading…
Cancel
Save