diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-21 21:28:33 +0200 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-21 21:28:33 +0200 |
commit | 8bb4ecdcbf4e41b08ebc3847b926fe520657a2b7 (patch) | |
tree | be97bdecfdca49e56e4b7bd00ddfee792a17a2ae /src/python/grpcio_health_checking/setup.py | |
parent | 8f18ee64b26d9a1462e8bccfb15aba00e8550492 (diff) | |
parent | f6aefa3ea66d6e49c3853dea260ef723ff796f99 (diff) |
Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix
Conflicts:
tools/run_tests/run_tests.py
Diffstat (limited to 'src/python/grpcio_health_checking/setup.py')
-rw-r--r-- | src/python/grpcio_health_checking/setup.py | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/python/grpcio_health_checking/setup.py b/src/python/grpcio_health_checking/setup.py index 70b4575bf5..727d628885 100644 --- a/src/python/grpcio_health_checking/setup.py +++ b/src/python/grpcio_health_checking/setup.py @@ -30,49 +30,42 @@ """Setup module for the GRPC Python package's optional health checking.""" import os -import os.path import sys -from distutils import core as _core import setuptools -import grpc.tools.command - # Ensure we're in the proper directory whether or not we're being used by pip. os.chdir(os.path.dirname(os.path.abspath(__file__))) # Break import-style to ensure we can actually find our commands module. import health_commands - -PACKAGES = ( - setuptools.find_packages('.') -) +import grpc_version PACKAGE_DIRECTORIES = { '': '.', } SETUP_REQUIRES = ( - 'grpcio-tools>=0.14.0', + 'grpcio-tools>=0.15.0', ) INSTALL_REQUIRES = ( - 'grpcio>=0.13.1', + 'grpcio>=0.15.0', ) COMMAND_CLASS = { # Run preprocess from the repository *before* doing any packaging! 'preprocess': health_commands.CopyProtoModules, - - 'build_proto_modules': grpc.tools.command.BuildProtoModules, - 'build_py': health_commands.BuildPy, + 'build_package_protos': health_commands.BuildPackageProtos, } setuptools.setup( name='grpcio-health-checking', - version='0.14.0', - packages=list(PACKAGES), + version=grpc_version.VERSION, + license='3-clause BSD', package_dir=PACKAGE_DIRECTORIES, + packages=setuptools.find_packages('.'), + namespace_packages=['grpc'], install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, cmdclass=COMMAND_CLASS |