diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-07 17:05:31 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-07 17:05:31 -0700 |
| commit | 7135ba96f88c250fc04ca670a56eaa179901edf2 (patch) | |
| tree | d953abcc972fcbd2997ae4ea812f68dd0792e6ca /test/distrib/python/run_distrib_test.sh | |
| parent | 8c33c7442c79682d2e545820f5653cabf25fd07e (diff) | |
| parent | 4e2f7727a9d39b58d6e3d083a7ed9a5aa6bb5fcc (diff) | |
Merge pull request #6473 from jtattermusch/python_packages_fixes
Python packages fixes
Diffstat (limited to 'test/distrib/python/run_distrib_test.sh')
| -rwxr-xr-x | test/distrib/python/run_distrib_test.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/distrib/python/run_distrib_test.sh b/test/distrib/python/run_distrib_test.sh index 6196e540c8..8a983bc248 100755 --- a/test/distrib/python/run_distrib_test.sh +++ b/test/distrib/python/run_distrib_test.sh @@ -48,7 +48,10 @@ which $PYTHON || PYTHON=python which $PIP || PIP=pip # TODO(jtattermusch): this shouldn't be required -${PIP} install --upgrade six pip +# TODO(jtattermusch): run the command twice to workaround docker-on-overlay +# issue https://github.com/docker/docker/issues/12327 +# (first attempt will fail when using docker with overlayFS) +${PIP} install --upgrade six pip || ${PIP} install --upgrade six pip # At least one of the bdist packages has to succeed (whichever one matches the # test machine, anyway). @@ -58,6 +61,6 @@ done # TODO(jtattermusch): add a .proto file to the distribtest, generate python # code from it and then use the generated code from distribtest.py -$PYTHON -m grpc.protoc.compiler +$PYTHON -m grpc.tools.protoc $PYTHON distribtest.py |