diff options
author | Lidi Zheng <scallopsky@gmail.com> | 2018-11-07 11:11:02 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-07 11:11:02 -0800 |
commit | 01c6565fb5a9631f6f1dd4f81662af711cab30aa (patch) | |
tree | b70265833bd7b5df3f4bf1ae4fd6a3edbc41d0c3 /tools/run_tests | |
parent | 678ea0895051646c80e59bc7ca6fe16d942e073d (diff) | |
parent | 8a0b08b574e968e02038004de9408c208e650fa1 (diff) |
Merge pull request #16995 from lidizheng/from-3.4-to-3.7
Migrate tests from Python 3.4 to Python 3.7
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-x | tools/run_tests/helper_scripts/build_python.sh | 5 | ||||
-rwxr-xr-x | tools/run_tests/run_tests.py | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh index eb3ea9e1f5..4c94c4c6d2 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -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 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 62bb6da7a7..a1f2aaab2f 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -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,) |