diff options
author | Lidi Zheng <lidiz@google.com> | 2018-11-06 09:59:22 -0800 |
---|---|---|
committer | Lidi Zheng <lidiz@google.com> | 2018-11-06 15:37:51 -0800 |
commit | 8a0b08b574e968e02038004de9408c208e650fa1 (patch) | |
tree | 409cdd5266708fc204f1c786745d0387fd44d196 /tools/run_tests | |
parent | adef5373f88084d0381bbe87ec0d69e0361862b0 (diff) |
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 6990244e51..bb7fd040ab 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -149,10 +149,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 44151f49fb..9ea0ce13f4 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,) |