diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
| commit | 9e2b7c81b10f79085df25a27fd2ab4b37e7d00e5 (patch) | |
| tree | 6a98eedeb3353289bee6ea5b44af8cbb62e031fa /src/python/grpcio_test/setup.py | |
| parent | a16b5ef455c63a18929b4ef90945e90f01c1fd58 (diff) | |
| parent | 9a2a3aecc8f7d667df0236df0367bb59a4ae37b1 (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'src/python/grpcio_test/setup.py')
| -rw-r--r-- | src/python/grpcio_test/setup.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/python/grpcio_test/setup.py b/src/python/grpcio_test/setup.py index 925c32720f..a6203cae2d 100644 --- a/src/python/grpcio_test/setup.py +++ b/src/python/grpcio_test/setup.py @@ -48,8 +48,13 @@ _PACKAGE_DIRECTORIES = { _PACKAGE_DATA = { 'grpc_interop': [ - 'credentials/ca.pem', 'credentials/server1.key', - 'credentials/server1.pem',] + 'credentials/ca.pem', + 'credentials/server1.key', + 'credentials/server1.pem', + ], + 'grpc_protoc_plugin': [ + 'test.proto', + ], } _SETUP_REQUIRES = ( @@ -75,5 +80,5 @@ setuptools.setup( package_data=_PACKAGE_DATA, install_requires=_INSTALL_REQUIRES + _SETUP_REQUIRES, setup_requires=_SETUP_REQUIRES, - cmdclass=_COMMAND_CLASS + cmdclass=_COMMAND_CLASS, ) |