diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-23 14:59:39 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-23 14:59:39 -0700 |
| commit | 668bf881a9449cc4f9885e4d3492e2cbe7476925 (patch) | |
| tree | cb1c019f2f5806d9acdb3d3f570a487b43f21c73 /src/python/grpcio_tests | |
| parent | 56d7044ed808e08af8b7a812a140bd751622f15c (diff) | |
| parent | d25c1d2a6c5ce6b0696a99c042e7c7026ac1a00c (diff) | |
Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x
Upmerge from v1.0.x
Diffstat (limited to 'src/python/grpcio_tests')
| -rw-r--r-- | src/python/grpcio_tests/setup.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py index 5c60eaca3a..3524355cbf 100644 --- a/src/python/grpcio_tests/setup.py +++ b/src/python/grpcio_tests/setup.py @@ -60,17 +60,14 @@ INSTALL_REQUIRES = ( 'coverage>=4.0', 'enum34>=1.0.4', 'futures>=2.2.0', - 'grpcio>=0.14.0', - 'grpcio-health-checking>=0.14.0', + 'grpcio>={version}'.format(version=grpc_version.VERSION), + 'grpcio-tools>={version}'.format(version=grpc_version.VERSION), + 'grpcio-health-checking>={version}'.format(version=grpc_version.VERSION), 'oauth2client>=1.4.7', 'protobuf>=3.0.0', 'six>=1.10', ) -SETUP_REQUIRES = ( - 'grpcio-tools>=0.14.0', -) - COMMAND_CLASS = { # Run `preprocess` *before* doing any packaging! 'preprocess': commands.GatherProto, @@ -115,7 +112,6 @@ setuptools.setup( package_dir=PACKAGE_DIRECTORIES, package_data=PACKAGE_DATA, install_requires=INSTALL_REQUIRES, - setup_requires=SETUP_REQUIRES, cmdclass=COMMAND_CLASS, tests_require=TESTS_REQUIRE, test_suite=TEST_SUITE, |