diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-15 07:13:35 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-15 07:13:35 -0800 |
| commit | 9a66ba5fe9b0714f2b48c6d3848d9716cdf85b91 (patch) | |
| tree | 3d5f47cd3bcc514a00b01ebc9e263cdcd275aaaf /tools/distrib/python/grpcio_tools | |
| parent | 9ee314af915277fb1833c1de127bd96a0ff2653a (diff) | |
| parent | 6997c3473b0e152b00cb5696cf5717e5adb37cb6 (diff) | |
Merge branch 'slice_with_exec_ctx' into metadata_filter
Diffstat (limited to 'tools/distrib/python/grpcio_tools')
| -rw-r--r-- | tools/distrib/python/grpcio_tools/MANIFEST.in | 2 | ||||
| -rw-r--r-- | tools/distrib/python/grpcio_tools/grpc_tools/command.py | 2 | ||||
| -rw-r--r-- | tools/distrib/python/grpcio_tools/grpc_tools/protoc.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/distrib/python/grpcio_tools/MANIFEST.in b/tools/distrib/python/grpcio_tools/MANIFEST.in index 7712834d64..11ce367747 100644 --- a/tools/distrib/python/grpcio_tools/MANIFEST.in +++ b/tools/distrib/python/grpcio_tools/MANIFEST.in @@ -2,6 +2,6 @@ include grpc_version.py include protoc_deps.py include protoc_lib_deps.py include README.rst -graft grpc +graft grpc_tools graft grpc_root graft third_party diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/command.py b/tools/distrib/python/grpcio_tools/grpc_tools/command.py index 43ec8c2a4c..31b3331a66 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/command.py +++ b/tools/distrib/python/grpcio_tools/grpc_tools/command.py @@ -49,7 +49,7 @@ def build_package_protos(package_root): for proto_file in proto_files: command = [ - 'grpc.tools.protoc', + 'grpc_tools.protoc', '--proto_path={}'.format(inclusion_root), '--proto_path={}'.format(well_known_protos_include), '--python_out={}'.format(inclusion_root), diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py index 7d5892dc4b..63fddb2f06 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py +++ b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py @@ -45,5 +45,5 @@ def main(command_arguments): return _protoc_compiler.run_main(command_arguments) if __name__ == '__main__': - proto_include = pkg_resources.resource_filename('grpc.tools', '_proto') + proto_include = pkg_resources.resource_filename('grpc_tools', '_proto') sys.exit(main(sys.argv + ['-I{}'.format(proto_include)])) |