Skip to content
Snippets Groups Projects
Commit 0589e533 authored by siddharthshukla's avatar siddharthshukla
Browse files

Make testing toolchain python 3.x compliant

six is necessary for making these scripts cross compatible
between python 2.x and 3.x

Changes:
Add six to python_deps.include
Include python_deps.include to all Dockerfile templates in test directory
Include python_deps.include to all Dockerfile templates in stress_test directory
Include python_deps.include to all Dockerfile templates in interop_test directory
Replace print statements with print function calls (from futute..)
Replace .iteritems() with .items() wherever necessary
use six.moves to import BaseHTTPServer
Generate new dockerfiles using generate_projects.sh
parent 7126163b
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 3 deletions
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../csharp_deps.include"/> <%include file="../../csharp_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM golang:1.5 FROM golang:1.5
<%include file="../../go_path.include"/> <%include file="../../go_path.include"/>
<%include file="../../python_deps.include"/>
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM golang:1.5 FROM golang:1.5
<%include file="../../go_path.include"/> <%include file="../../go_path.include"/>
<%include file="../../python_deps.include"/>
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../java_deps.include"/> <%include file="../../java_deps.include"/>
<%include file="../../python_deps.include"/>
# Trigger download of as many Gradle artifacts as possible. # Trigger download of as many Gradle artifacts as possible.
RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && ${'\\'} RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && ${'\\'}
cd grpc-java && ${'\\'} cd grpc-java && ${'\\'}
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../node_deps.include"/> <%include file="../../node_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../ruby_deps.include"/> <%include file="../../ruby_deps.include"/>
<%include file="../../php_deps.include"/> <%include file="../../php_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../ruby_deps.include"/> <%include file="../../ruby_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
......
...@@ -11,4 +11,4 @@ RUN apt-get update && apt-get install -y ${'\\'} ...@@ -11,4 +11,4 @@ RUN apt-get update && apt-get install -y ${'\\'}
# Install Python packages from PyPI # Install Python packages from PyPI
RUN pip install pip --upgrade RUN pip install pip --upgrade
RUN pip install virtualenv RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 six==1.10.0
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../ccache_setup.include"/> <%include file="../../ccache_setup.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../ccache_setup.include"/> <%include file="../../ccache_setup.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM golang:1.5 FROM golang:1.5
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../go_path.include"/> <%include file="../../go_path.include"/>
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../ccache_setup.include"/> <%include file="../../ccache_setup.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../node_deps.include"/> <%include file="../../node_deps.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../ruby_deps.include"/> <%include file="../../ruby_deps.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
<%include file="../../php_deps.include"/> <%include file="../../php_deps.include"/>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../ccache_setup.include"/> <%include file="../../ccache_setup.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../csharp_deps.include"/> <%include file="../../csharp_deps.include"/>
# Install dotnet SDK based on https://www.microsoft.com/net/core#debian # Install dotnet SDK based on https://www.microsoft.com/net/core#debian
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../csharp_deps.include"/> <%include file="../../csharp_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM debian:jessie FROM debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../clang_update.include"/> <%include file="../../clang_update.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
FROM 32bit/debian:jessie FROM 32bit/debian:jessie
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment