diff options
| author |  kpayson64 <kpayson@google.com> | 2017-06-05 10:25:58 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-05 10:25:58 -0700 |
| commit | b1332047d049d788a59284a561f4d6c2c2488792 (patch) | |
| tree | cd3ab05661dc5b65d4daee8ed82f6820a2f57663 | |
| parent | 7c23d31f1b1eca8e7e8ce9f6952d5cf8d6a44955 (diff) | |
| parent | 1b0661bfd7afbb90256adcffead8c01167657e3e (diff) | |
Merge pull request #11398 from kpayson64/rollback_changes
Rollback Dockerfile changes
| -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_matrix.py | 9 |
3 files changed, 1 insertions, 12 deletions
diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile index f470bc2487..cc69f4b5cd 100644 --- a/tools/dockerfile/test/python_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile @@ -75,8 +75,7 @@ RUN pip install --upgrade google-api-python-client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip \ - python3-pip + python-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 bd4b40b508..6ad285cdb9 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -146,7 +146,6 @@ 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_matrix.py b/tools/run_tests/run_tests_matrix.py index 84551d9394..c6f49174a9 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -251,15 +251,6 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) configs=['dbg'], platforms=['linux'], arch='default', - compiler='python3.4', - labels=['portability'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['python'], - configs=['dbg'], - platforms=['linux'], - arch='default', compiler='python_alpine', labels=['portability'], extra_args=extra_args, |