diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2015-12-07 17:25:40 -0800 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2015-12-07 17:25:40 -0800 |
| commit | b91c7068200895d7d0b9752a5e9520b2df6c04bd (patch) | |
| tree | 0e797f0cf9012c012b6e036f5c98279d0cd0c725 /tools | |
| parent | 340661dbcd7282afb00e967f7e2d644a8c318817 (diff) | |
| parent | 7a6b0a4293fe39445aeb85b091fec07f9e9f5f0a (diff) | |
Merge Python tox fix into release-0.12-to-be-merged-into-master
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/jenkins/grpc_interop_python/Dockerfile | 1 | ||||
| -rwxr-xr-x | tools/run_tests/build_python.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/tools/jenkins/grpc_interop_python/Dockerfile b/tools/jenkins/grpc_interop_python/Dockerfile index 5850f5f321..6034cbf955 100644 --- a/tools/jenkins/grpc_interop_python/Dockerfile +++ b/tools/jenkins/grpc_interop_python/Dockerfile @@ -75,6 +75,7 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ # Install Python requisites RUN /bin/bash -l -c "pip install --upgrade pip" RUN /bin/bash -l -c "pip install virtualenv" +RUN /bin/bash -l -c "pip install tox" # Define the default command. CMD ["bash"] diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh index 7db14ce9d1..57080ce934 100755 --- a/tools/run_tests/build_python.sh +++ b/tools/run_tests/build_python.sh @@ -45,3 +45,5 @@ export GRPC_PYTHON_ENABLE_CYTHON_TRACING=1 cd $GRPCIO tox --notest + +$GRPCIO/.tox/py27/bin/python $GRPCIO/setup.py build diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 36b2dc0696..37b631bd0d 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -266,7 +266,7 @@ class PythonLanguage: def client_cmd(self, args): return [ - 'python2.7_virtual_environment/bin/python', + 'src/python/grpcio/.tox/py27/bin/python', 'src/python/grpcio/setup.py', 'run_interop', '--client', @@ -278,7 +278,7 @@ class PythonLanguage: def server_cmd(self, args): return [ - 'python2.7_virtual_environment/bin/python', + 'src/python/grpcio/.tox/py27/bin/python', 'src/python/grpcio/setup.py', 'run_interop', '--server', |