diff options
| author |  kpayson64 <kpayson@google.com> | 2017-06-02 12:33:14 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-02 12:33:14 -0700 |
| commit | b3abfa6ac7bbe3e51d8a59d81e3e67c216d71339 (patch) | |
| tree | bcb5096ee73c8aaaa27383682d16a7ac615a7e4d /tools | |
| parent | 6f816184734a27a3ad8a567e399c5011dee1e410 (diff) | |
| parent | 631862f42100520b0d5d4602aeb4e547581eef72 (diff) | |
Merge pull request #11374 from kpayson64/kokoro_python
Change Python Windows tests to 3.5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/test/python_jessie_x64/Dockerfile | 3 | ||||
| -rwxr-xr-x | tools/run_tests/helper_scripts/build_python.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile index cc69f4b5cd..f470bc2487 100644 --- a/tools/dockerfile/test/python_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile @@ -75,7 +75,8 @@ RUN pip install --upgrade google-api-python-client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-pip \ + python3-pip # Install Python packages from PyPI RUN pip install pip --upgrade diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh index 6ad285cdb9..bd4b40b508 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -146,6 +146,7 @@ fi ############################ # Perform build operations # ############################ +$PYTHON -m pip install virtualenv # Instnatiate the virtualenv, preferring to do so from the relevant python # version. Even if these commands fail (e.g. on Windows due to name conflicts) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 568774cece..204ed5c397 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -672,7 +672,7 @@ class PythonLanguage(object): if args.compiler == 'default': if os.name == 'nt': - return (python27_config,) + return (python35_config,) else: return (python27_config, python34_config,) elif args.compiler == 'python2.7': |