diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/test/python_jessie_x64/Dockerfile | 3 | ||||
| -rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_macos_rc | 18 | ||||
| -rwxr-xr-x | tools/run_tests/helper_scripts/build_python.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 9 |
4 files changed, 7 insertions, 24 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/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 3eccff80b4..44d1fcbb3a 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -40,33 +40,27 @@ brew install autoconf automake libtool ccache cmake gflags gpg wget # TODO(jtattermusch): install cocoapods # python -wget https://bootstrap.pypa.io/get-pip.py +wget -q https://bootstrap.pypa.io/get-pip.py sudo python get-pip.py sudo pip install virtualenv # TODO(jtattermusch): install python3 # mono -wget https://download.mono-project.com/archive/5.0.1/macos-10-universal/MonoFramework-MDK-5.0.1.1.macos10.xamarin.universal.pkg +wget -q https://download.mono-project.com/archive/5.0.1/macos-10-universal/MonoFramework-MDK-5.0.1.1.macos10.xamarin.universal.pkg sudo installer -pkg MonoFramework-MDK-5.0.1.1.macos10.xamarin.universal.pkg -target / +ln -s /Library/Frameworks/Mono.framework/Versions/Current/bin/mono /usr/local/bin/mono # dotnet SDK -wget https://go.microsoft.com/fwlink/?linkid=843444 -O dotnet-dev-osx-x64.1.0.1.pkg +brew install openssl +wget -q https://go.microsoft.com/fwlink/?linkid=843444 -O dotnet-dev-osx-x64.1.0.1.pkg sudo installer -pkg dotnet-dev-osx-x64.1.0.1.pkg -target / ln -s /usr/local/share/dotnet/dotnet /usr/local/bin/dotnet dotnet --version # bootstrap dotnet SDK # nvm wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash -# bootstrap nvm silently & without terminating this script -set +ex -source ~/.nvm/nvm.sh -set -ex -# node -nvm install 4 -nvm alias default 4 -npm update npm -g -npm install -g node-pre-gyp +# TODO(jtattermusch): install node if needed git submodule update --init 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, |