fix: Allow protobuf 5.x; require protobuf >=3.20.2 (#950)

parthea · web-flow · commit 6f86506030ba · 2024-08-13T09:35:19.000-07:00
diff --git a/setup.py b/setup.py
@@ -37,7 +37,7 @@
     "google-cloud-core >= 1.4.1, <3.0.0dev",
     "proto-plus >= 1.22.0, <2.0.0dev",
     "proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'",
-    "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
+    "protobuf>=3.20.2,<6.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
 ]
 extras = {}
 
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
@@ -9,4 +9,4 @@ google-api-core==1.34.0
 google-auth==2.14.1
 google-cloud-core==1.4.1
 proto-plus==1.22.0
-protobuf==3.19.5  # transitive from `google-api-core`
+protobuf==3.20.2  # transitive from `google-api-core`

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`"google-cloud-core >= 1.4.1, <3.0.0dev",`
`38`	`38`	`"proto-plus >= 1.22.0, <2.0.0dev",`
`39`	`39`	`"proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'",`
`40`		`- "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",`
	`40`	`+ "protobuf>=3.20.2,<6.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",`
`41`	`41`	`]`
`42`	`42`	`extras = {}`
`43`	`43`