From e5131b524344675451522b86a98f1a13f074a88e Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Thu, 11 Apr 2024 15:37:19 -0700 Subject: [PATCH] [Python grpcio_tools] Update version requirement of protobuf in grpcio_tools (#36230) Since we already finished v26.1 upgrade in https://github.com/grpc/grpc/pull/35796 Closes #36230 PiperOrigin-RevId: 623960260 --- requirements.txt | 2 +- src/python/grpcio_channelz/setup.py | 2 +- src/python/grpcio_csds/setup.py | 2 +- src/python/grpcio_health_checking/setup.py | 2 +- src/python/grpcio_reflection/setup.py | 2 +- src/python/grpcio_status/setup.py | 2 +- src/python/grpcio_testing/setup.py | 2 +- src/python/grpcio_tests/setup.py | 2 +- tools/distrib/python/grpcio_tools/setup.py | 2 +- tools/distrib/python/xds_protos/setup.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 56169434b1b..24b79d71cf6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # GRPC Python setup requirements coverage>=4.0 cython>=3.0.0 -protobuf>=4.21.3,<5.0dev +protobuf>=5.26.1,<6.0dev wheel>=0.29 diff --git a/src/python/grpcio_channelz/setup.py b/src/python/grpcio_channelz/setup.py index 06283d8ba37..034ed814829 100644 --- a/src/python/grpcio_channelz/setup.py +++ b/src/python/grpcio_channelz/setup.py @@ -61,7 +61,7 @@ PACKAGE_DIRECTORIES = { } INSTALL_REQUIRES = ( - "protobuf>=4.21.6", + "protobuf>=5.26.1,<6.0dev", "grpcio>={version}".format(version=grpc_version.VERSION), ) diff --git a/src/python/grpcio_csds/setup.py b/src/python/grpcio_csds/setup.py index 0aa3d50c1a0..8fb4dab5341 100644 --- a/src/python/grpcio_csds/setup.py +++ b/src/python/grpcio_csds/setup.py @@ -39,7 +39,7 @@ PACKAGE_DIRECTORIES = { } INSTALL_REQUIRES = ( - "protobuf>=4.21.6", + "protobuf>=5.26.1,<6.0dev", f"xds-protos=={grpc_version.VERSION}", f"grpcio>={grpc_version.VERSION}", ) diff --git a/src/python/grpcio_health_checking/setup.py b/src/python/grpcio_health_checking/setup.py index b6dda84ed6f..97a40723097 100644 --- a/src/python/grpcio_health_checking/setup.py +++ b/src/python/grpcio_health_checking/setup.py @@ -60,7 +60,7 @@ PACKAGE_DIRECTORIES = { } INSTALL_REQUIRES = ( - "protobuf>=4.21.6", + "protobuf>=5.26.1,<6.0dev", "grpcio>={version}".format(version=grpc_version.VERSION), ) diff --git a/src/python/grpcio_reflection/setup.py b/src/python/grpcio_reflection/setup.py index 37d5af18fa0..fd2cd7eb872 100644 --- a/src/python/grpcio_reflection/setup.py +++ b/src/python/grpcio_reflection/setup.py @@ -61,7 +61,7 @@ PACKAGE_DIRECTORIES = { } INSTALL_REQUIRES = ( - "protobuf>=4.21.6", + "protobuf>=5.26.1,<6.0dev", "grpcio>={version}".format(version=grpc_version.VERSION), ) diff --git a/src/python/grpcio_status/setup.py b/src/python/grpcio_status/setup.py index 503c11ee00d..f70013774c9 100644 --- a/src/python/grpcio_status/setup.py +++ b/src/python/grpcio_status/setup.py @@ -60,7 +60,7 @@ PACKAGE_DIRECTORIES = { } INSTALL_REQUIRES = ( - "protobuf>=4.21.6", + "protobuf>=5.26.1,<6.0dev", "grpcio>={version}".format(version=grpc_version.VERSION), "googleapis-common-protos>=1.5.5", ) diff --git a/src/python/grpcio_testing/setup.py b/src/python/grpcio_testing/setup.py index fad6d799bde..f2bd711d5c9 100644 --- a/src/python/grpcio_testing/setup.py +++ b/src/python/grpcio_testing/setup.py @@ -49,7 +49,7 @@ PACKAGE_DIRECTORIES = { } INSTALL_REQUIRES = ( - "protobuf>=4.21.6", + "protobuf>=5.26.1,<6.0dev", "grpcio>={version}".format(version=grpc_version.VERSION), ) diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py index 83f3bcb55b0..7cfc2b308b4 100644 --- a/src/python/grpcio_tests/setup.py +++ b/src/python/grpcio_tests/setup.py @@ -46,7 +46,7 @@ INSTALL_REQUIRES = ( "grpcio-observability>={version}".format(version=grpc_version.VERSION), "xds-protos>={version}".format(version=grpc_version.VERSION), "oauth2client>=1.4.7", - "protobuf>=4.21.6rc1,!=4.22.0.*", + "protobuf>=5.26.1,<6.0dev", "google-auth>=1.17.2", "requests>=2.14.2", "absl-py>=1.4.0", diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index d2cecee2c9e..03a895619ca 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -329,7 +329,7 @@ setuptools.setup( packages=setuptools.find_packages("."), python_requires=">=3.8", install_requires=[ - "protobuf>=4.21.6,<5.0dev", + "protobuf>=5.26.1,<6.0dev", "grpcio>={version}".format(version=grpc_version.VERSION), "setuptools", ], diff --git a/tools/distrib/python/xds_protos/setup.py b/tools/distrib/python/xds_protos/setup.py index 71c5429cd58..f1c7247cc4b 100644 --- a/tools/distrib/python/xds_protos/setup.py +++ b/tools/distrib/python/xds_protos/setup.py @@ -39,7 +39,7 @@ CLASSIFIERS = [ ] INSTALL_REQUIRES = [ "grpcio>=1.49.0", - "protobuf>=4.21.6,<5.0dev", + "protobuf>=5.26.1,<6.0dev", ] SETUP_REQUIRES = INSTALL_REQUIRES + ["grpcio-tools>=1.49.0"]