1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
|
From 3a08155fe6216d3d7c4ea34f867b576e05e65cd5 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Thu, 13 Mar 2025 15:59:24 +0000
Subject: [PATCH] fix: resolve issue where pre-release versions of protobuf are
installed
---
requirements.txt | 2 +-
src/python/grpcio_channelz/setup.py | 2 +-
src/python/grpcio_csds/setup.py | 2 +-
src/python/grpcio_csm_observability/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/docgen/requirements.docs.lock | 2 +-
tools/distrib/python/grpcio_tools/setup.py | 2 +-
tools/distrib/python/xds_protos/setup.py | 2 +-
tools/run_tests/helper_scripts/build_python.sh | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 41863c4408258..29538df03bdc7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
# GRPC Python setup requirements
coverage>=4.0
cython>=3.0.0
-protobuf>=6.30.0,<7.0dev
+protobuf>=6.30.0,<7.0.0
wheel>=0.29
diff --git a/src/python/grpcio_channelz/setup.py b/src/python/grpcio_channelz/setup.py
index 9a8f7ba2c8c33..4d9bccb2f1094 100644
--- a/src/python/grpcio_channelz/setup.py
+++ b/src/python/grpcio_channelz/setup.py
@@ -65,7 +65,7 @@ def run(self):
}
INSTALL_REQUIRES = (
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
"grpcio>={version}".format(version=grpc_version.VERSION),
)
diff --git a/src/python/grpcio_csds/setup.py b/src/python/grpcio_csds/setup.py
index 0a370c870283c..65210b0c80ab6 100644
--- a/src/python/grpcio_csds/setup.py
+++ b/src/python/grpcio_csds/setup.py
@@ -41,7 +41,7 @@
}
INSTALL_REQUIRES = (
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
f"xds-protos=={grpc_version.VERSION}",
f"grpcio>={grpc_version.VERSION}",
)
diff --git a/src/python/grpcio_csm_observability/setup.py b/src/python/grpcio_csm_observability/setup.py
index 3c9fd163f57e9..ebb9be3ab99b2 100644
--- a/src/python/grpcio_csm_observability/setup.py
+++ b/src/python/grpcio_csm_observability/setup.py
@@ -41,7 +41,7 @@
"opentelemetry-sdk>=1.25.0",
"opentelemetry-resourcedetector-gcp>=1.6.0a0",
"grpcio=={version}".format(version=grpc_version.VERSION),
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
)
setuptools.setup(
diff --git a/src/python/grpcio_health_checking/setup.py b/src/python/grpcio_health_checking/setup.py
index d422e4ab5b253..64d158f05319e 100644
--- a/src/python/grpcio_health_checking/setup.py
+++ b/src/python/grpcio_health_checking/setup.py
@@ -63,7 +63,7 @@ def run(self):
}
INSTALL_REQUIRES = (
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
"grpcio>={version}".format(version=grpc_version.VERSION),
)
diff --git a/src/python/grpcio_reflection/setup.py b/src/python/grpcio_reflection/setup.py
index 0241395f591b7..71dad49dcb3bb 100644
--- a/src/python/grpcio_reflection/setup.py
+++ b/src/python/grpcio_reflection/setup.py
@@ -64,7 +64,7 @@ def run(self):
}
INSTALL_REQUIRES = (
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
"grpcio>={version}".format(version=grpc_version.VERSION),
)
diff --git a/src/python/grpcio_status/setup.py b/src/python/grpcio_status/setup.py
index 0ebe5fb1511c6..dd680aca6882f 100644
--- a/src/python/grpcio_status/setup.py
+++ b/src/python/grpcio_status/setup.py
@@ -63,7 +63,7 @@ def run(self):
}
INSTALL_REQUIRES = (
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
"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 3480df40f5734..f9453e6649b9c 100644
--- a/src/python/grpcio_testing/setup.py
+++ b/src/python/grpcio_testing/setup.py
@@ -49,7 +49,7 @@ def run(self):
}
INSTALL_REQUIRES = (
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
"grpcio>={version}".format(version=grpc_version.VERSION),
)
diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py
index 9ba15ba168a5b..54f4228a990c4 100644
--- a/src/python/grpcio_tests/setup.py
+++ b/src/python/grpcio_tests/setup.py
@@ -46,7 +46,7 @@
"grpcio-observability>={version}".format(version=grpc_version.VERSION),
"xds-protos>={version}".format(version=grpc_version.VERSION),
"oauth2client>=1.4.7",
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
"google-auth>=1.17.2",
"requests>=2.14.2",
"absl-py>=1.4.0",
diff --git a/tools/distrib/docgen/requirements.docs.lock b/tools/distrib/docgen/requirements.docs.lock
index daab464389f04..ad255050875dc 100644
--- a/tools/distrib/docgen/requirements.docs.lock
+++ b/tools/distrib/docgen/requirements.docs.lock
@@ -26,7 +26,7 @@ opentelemetry-sdk==1.25.0
opentelemetry-semantic-conventions==0.46b0
prometheus_client==0.20.0
proto-plus==1.25.0
-protobuf>=5.27.1,<6.0dev
+protobuf>=5.27.1,<6.0.0
pyasn1-modules==0.3.0
pyasn1==0.5.0
requests==2.25.1
diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py
index d15a6090ce174..f729fba889fef 100644
--- a/tools/distrib/python/grpcio_tools/setup.py
+++ b/tools/distrib/python/grpcio_tools/setup.py
@@ -343,7 +343,7 @@ def extension_modules():
packages=setuptools.find_packages("."),
python_requires=f">={python_version.MIN_PYTHON_VERSION}",
install_requires=[
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
"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 e42a13fe18704..6051613873aab 100644
--- a/tools/distrib/python/xds_protos/setup.py
+++ b/tools/distrib/python/xds_protos/setup.py
@@ -40,7 +40,7 @@
]
INSTALL_REQUIRES = [
"grpcio>=1.49.0",
- "protobuf>=6.30.0,<7.0dev",
+ "protobuf>=6.30.0,<7.0.0",
]
SETUP_REQUIRES = INSTALL_REQUIRES + ["grpcio-tools>=1.49.0"]
diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh
index e33783c559d60..43afdfea9e6e2 100755
--- a/tools/run_tests/helper_scripts/build_python.sh
+++ b/tools/run_tests/helper_scripts/build_python.sh
@@ -172,7 +172,7 @@ pip_install_dir_and_deps() {
pip_install -U gevent
pip_install --upgrade 'cython>=3.0.0'
-pip_install --upgrade six 'protobuf>=6.30.0,<7.0dev'
+pip_install --upgrade six 'protobuf>=6.30.0,<7.0.0'
if [ "$("$VENV_PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ]
then
|
