diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-27 15:36:14 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-27 15:36:14 -0800 |
| commit | 5aca1dde32c4d8c278c00aa6662f01a9a6c49517 (patch) | |
| tree | b73b408cef40c02fa550bfa5202896e0469e71c9 /src/python/grpcio_tests/setup.py | |
| parent | a1878705357cad75a1c33620fbb5362e46cca678 (diff) | |
| parent | 22b28264f9242b6d049f9e6d5b792bd5be048a97 (diff) | |
Merge github.com:grpc/grpc into flow_control_v2
Diffstat (limited to 'src/python/grpcio_tests/setup.py')
| -rw-r--r-- | src/python/grpcio_tests/setup.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py index 7384206602..375fbd6c77 100644 --- a/src/python/grpcio_tests/setup.py +++ b/src/python/grpcio_tests/setup.py @@ -35,7 +35,7 @@ import sys import setuptools -import grpc.tools.command +import grpc_tools.command PY3 = sys.version_info.major == 3 @@ -68,7 +68,7 @@ COMMAND_CLASS = { # Run `preprocess` *before* doing any packaging! 'preprocess': commands.GatherProto, - 'build_package_protos': grpc.tools.command.BuildPackageProtos, + 'build_package_protos': grpc_tools.command.BuildPackageProtos, 'build_py': commands.BuildPy, 'run_interop': commands.RunInterop, 'test_lite': commands.TestLite @@ -80,8 +80,14 @@ PACKAGE_DATA = { 'credentials/server1.key', 'credentials/server1.pem', ], - 'tests.protoc_plugin': [ - 'protoc_plugin_test.proto', + 'tests.protoc_plugin.protos.invocation_testing': [ + 'same.proto', + ], + 'tests.protoc_plugin.protos.invocation_testing.split_messages': [ + 'messages.proto', + ], + 'tests.protoc_plugin.protos.invocation_testing.split_services': [ + 'services.proto', ], 'tests.unit': [ 'credentials/ca.pem', |