Trust google-auth library will handle their dependency properly

pull/23200/head
Lidi Zheng 5 years ago
parent 1b72975dfd
commit 43a574d1ae
  1. 4
      requirements.bazel.txt
  2. 2
      requirements.txt
  3. 2
      src/python/grpcio_tests/setup.py
  4. 7
      tools/run_tests/helper_scripts/build_python.sh

@ -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

@ -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

@ -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',)

@ -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"

Loading…
Cancel
Save