Skip to content

Commit ee31dd0

Browse files
ivanmkcpartheasamgoodman
authored andcommitted
fix: Pinned protobuf to prevent issues with pb files. (#1398)
* Pinned protobuf to prevent issues with pb files. Currently, we rely on dependencies like proto-plus-python to select a protobuf library version. However, if they select an incompatible version, it can lead to issues like #1257 * fix: Added upper limits for proto-plus + packaging * Added testing constraint Co-authored-by: Anthonios Partheniou <[email protected]> Co-authored-by: Sam Goodman <[email protected]>
1 parent 506f536 commit ee31dd0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@
103103
# Until this issue is closed
104104
# https://github.com/googleapis/google-cloud-python/issues/10566
105105
"google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
106-
"proto-plus >= 1.15.0",
107-
"packaging >= 14.3",
106+
"proto-plus >= 1.15.0, <2.0.0dev",
107+
"protobuf >= 3.19.0, <4.0.0dev",
108+
"packaging >= 14.3, <22.0.0dev",
108109
"google-cloud-storage >= 1.32.0, < 3.0.0dev",
109110
"google-cloud-bigquery >= 1.15.0, < 3.0.0dev",
110111
"google-cloud-resource-manager >= 1.3.3, < 3.0.0dev",

testing/constraints-3.6.txt

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
google-api-core==1.31.5
99
libcst==0.2.5
1010
proto-plus==1.15.0
11+
protobuf==3.19.0
1112
mock==4.0.2
1213
google-cloud-storage==1.32.0
1314
google-auth==1.25.0 # TODO: Remove when google-api-core >= 1.26.0 is required

0 commit comments

Comments
 (0)