diff options
| author |  kpayson64 <kpayson@google.com> | 2016-08-03 13:42:00 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-03 13:42:00 -0700 |
| commit | 8ebb2a95947ab4e53729a6ca4b1e77a12feb82e3 (patch) | |
| tree | 3d5c3c986d2a35a68458b62fce11eb9adf2b9cce | |
| parent | 86ea627270142b15be2262ca60802e007b62f6fd (diff) | |
| parent | e5fd01a3892de022769615832266c24d4cc7bea4 (diff) | |
Merge pull request #7613 from kpayson64/py_protobuf_upgrade
Bump python protobuf dependency to 3.0.0
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio_health_checking/setup.py | 1 | ||||
| -rw-r--r-- | src/python/grpcio_tests/setup.py | 2 | ||||
| -rw-r--r-- | tools/distrib/python/grpcio_tools/setup.py | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index 0ec0e75b76..bf87de07f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ coverage>=4.0 cython>=0.23 enum34>=1.0.4 futures>=2.2.0 -protobuf>=3.0.0a3 +protobuf>=3.0.0 six>=1.10 -wheel>=0.29
\ No newline at end of file +wheel>=0.29 @@ -189,7 +189,7 @@ INSTALL_REQUIRES = ( 'futures>=2.2.0', # TODO(atash): eventually split the grpcio package into a metapackage # depending on protobuf and the runtime component (independent of protobuf) - 'protobuf>=3.0.0a3', + 'protobuf>=3.0.0', ) SETUP_REQUIRES = INSTALL_REQUIRES + ( diff --git a/src/python/grpcio_health_checking/setup.py b/src/python/grpcio_health_checking/setup.py index 727d628885..6074175a44 100644 --- a/src/python/grpcio_health_checking/setup.py +++ b/src/python/grpcio_health_checking/setup.py @@ -50,6 +50,7 @@ SETUP_REQUIRES = ( ) INSTALL_REQUIRES = ( + 'protobuf>=3.0.0', 'grpcio>=0.15.0', ) diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py index 0afaf7dfa2..5c60eaca3a 100644 --- a/src/python/grpcio_tests/setup.py +++ b/src/python/grpcio_tests/setup.py @@ -63,7 +63,7 @@ INSTALL_REQUIRES = ( 'grpcio>=0.14.0', 'grpcio-health-checking>=0.14.0', 'oauth2client>=1.4.7', - 'protobuf>=3.0.0a3', + 'protobuf>=3.0.0', 'six>=1.10', ) diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index 8082c7a665..43d0f5518a 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -148,7 +148,7 @@ setuptools.setup( packages=setuptools.find_packages('.'), namespace_packages=['grpc'], install_requires=[ - 'protobuf>=3.0.0a3', + 'protobuf>=3.0.0', 'grpcio>=0.15.0', ], package_data=package_data(), |