diff options
author | 2016-05-07 17:05:31 -0700 | |
---|---|---|
committer | 2016-05-07 17:05:31 -0700 | |
commit | 7135ba96f88c250fc04ca670a56eaa179901edf2 (patch) | |
tree | d953abcc972fcbd2997ae4ea812f68dd0792e6ca | |
parent | 8c33c7442c79682d2e545820f5653cabf25fd07e (diff) | |
parent | 4e2f7727a9d39b58d6e3d083a7ed9a5aa6bb5fcc (diff) |
Merge pull request #6473 from jtattermusch/python_packages_fixes
Python packages fixes
-rwxr-xr-x | test/distrib/python/run_distrib_test.sh | 7 | ||||
-rw-r--r-- | tools/distrib/python/grpcio_tools/grpc/tools/__init__.py (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/__init__.py) | 0 | ||||
-rw-r--r-- | tools/distrib/python/grpcio_tools/grpc/tools/main.cc (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/main.cc) | 2 | ||||
-rw-r--r-- | tools/distrib/python/grpcio_tools/grpc/tools/main.h (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/main.h) | 0 | ||||
-rw-r--r-- | tools/distrib/python/grpcio_tools/grpc/tools/protoc.py (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/compiler.py) | 2 | ||||
-rw-r--r-- | tools/distrib/python/grpcio_tools/grpc/tools/protoc_compiler.pyx (renamed from tools/distrib/python/grpcio_tools/grpc/protoc/protoc_compiler.pyx) | 2 | ||||
-rw-r--r-- | tools/distrib/python/grpcio_tools/setup.py | 6 |
7 files changed, 11 insertions, 8 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 diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/__init__.py b/tools/distrib/python/grpcio_tools/grpc/tools/__init__.py index d5ad73a74a..d5ad73a74a 100644 --- a/tools/distrib/python/grpcio_tools/grpc/protoc/__init__.py +++ b/tools/distrib/python/grpcio_tools/grpc/tools/__init__.py diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/main.cc b/tools/distrib/python/grpcio_tools/grpc/tools/main.cc index c9936a3a6b..81675b4e6f 100644 --- a/tools/distrib/python/grpcio_tools/grpc/protoc/main.cc +++ b/tools/distrib/python/grpcio_tools/grpc/tools/main.cc @@ -32,7 +32,7 @@ #include "src/compiler/python_generator.h" -#include "grpc/protoc/main.h" +#include "grpc/tools/main.h" int protoc_main(int argc, char* argv[]) { google::protobuf::compiler::CommandLineInterface cli; diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/main.h b/tools/distrib/python/grpcio_tools/grpc/tools/main.h index ea2860ff02..ea2860ff02 100644 --- a/tools/distrib/python/grpcio_tools/grpc/protoc/main.h +++ b/tools/distrib/python/grpcio_tools/grpc/tools/main.h diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/compiler.py b/tools/distrib/python/grpcio_tools/grpc/tools/protoc.py index caafc544b2..b4dd0ecae2 100644 --- a/tools/distrib/python/grpcio_tools/grpc/protoc/compiler.py +++ b/tools/distrib/python/grpcio_tools/grpc/tools/protoc.py @@ -31,7 +31,7 @@ import sys -from grpc.protoc import protoc_compiler +from grpc.tools import protoc_compiler if __name__ == '__main__': diff --git a/tools/distrib/python/grpcio_tools/grpc/protoc/protoc_compiler.pyx b/tools/distrib/python/grpcio_tools/grpc/tools/protoc_compiler.pyx index af15f3db30..a6530127c0 100644 --- a/tools/distrib/python/grpcio_tools/grpc/protoc/protoc_compiler.pyx +++ b/tools/distrib/python/grpcio_tools/grpc/tools/protoc_compiler.pyx @@ -29,7 +29,7 @@ from libc cimport stdlib -cdef extern from "grpc/protoc/main.h": +cdef extern from "grpc/tools/main.h": int protoc_main(int argc, char *argv[]) def run_main(list args not None): diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index 0281c01796..1a77c430fa 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -45,13 +45,13 @@ import grpc_version def protoc_ext_module(): plugin_sources = [ - 'grpc/protoc/main.cc', + 'grpc/tools/main.cc', 'grpc_root/src/compiler/python_generator.cc'] + [ os.path.join('third_party/protobuf/src', cc_file) for cc_file in protoc_lib_deps.CC_FILES] plugin_ext = extension.Extension( - name='grpc.protoc.protoc_compiler', - sources=['grpc/protoc/protoc_compiler.pyx'] + plugin_sources, + name='grpc.tools.protoc_compiler', + sources=['grpc/tools/protoc_compiler.pyx'] + plugin_sources, include_dirs=[ '.', 'grpc_root', |