Merge pull request #16995 from lidizheng/from-3.4-to-3.7

Migrate tests from Python 3.4 to Python 3.7
pull/17141/head
Lidi Zheng 6 years ago committed by GitHub
commit 01c6565fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/python/grpcio_tests/commands.py
  2. 5
      tools/run_tests/helper_scripts/build_python.sh
  3. 6
      tools/run_tests/run_tests.py

@ -130,7 +130,9 @@ class TestGevent(setuptools.Command):
# Beta API is unsupported for gevent
'protoc_plugin.beta_python_plugin_test',
'unit.beta._beta_features_test',
)
# TODO(https://github.com/grpc/grpc/issues/15411) unpin gevent version
# This test will stuck while running higher version of gevent
'unit._auth_context_test.AuthContextTest.testSessionResumption')
description = 'run tests with gevent. Assumes grpc/gevent are installed'
user_options = []

@ -155,10 +155,13 @@ pip_install_dir() {
}
case "$VENV" in
*gevent*)
*py35_gevent*)
# TODO(https://github.com/grpc/grpc/issues/15411) unpin this
$VENV_PYTHON -m pip install gevent==1.3.b1
;;
*gevent*)
$VENV_PYTHON -m pip install -U gevent
;;
esac
$VENV_PYTHON -m pip install --upgrade pip==10.0.1

@ -765,8 +765,10 @@ class PythonLanguage(object):
return 'stretch_' + self.args.compiler[len('python'):]
elif self.args.compiler == 'python_alpine':
return 'alpine'
else:
elif self.args.compiler == 'python3.4':
return 'jessie'
else:
return 'stretch_3.7'
def _get_pythons(self, args):
if args.arch == 'x86':
@ -844,7 +846,7 @@ class PythonLanguage(object):
else:
return (
python27_config,
python34_config,
python37_config,
)
elif args.compiler == 'python2.7':
return (python27_config,)

Loading…
Cancel
Save