fix: [Many APIs] Allow Protobuf 6.x (googleapis#13634)

gcf-owl-bot[bot] · web-flow · commit 36e8ba12eac9 · 2025-03-12T13:16:20.000-07:00
- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE fix: [Many APIs] Allow Protobuf 6.x chore: Update gapic-generator-python to v1.23.5 END_COMMIT_OVERRIDE chore: Update gapic-generator-python to v1.23.5 PiperOrigin-RevId: 735388698 Source-Link: googleapis/googleapis@a3dda51 Source-Link: https://github.com/googleapis/googleapis-gen/commit/c329c693d2da063a89ecc29e15dc196769aa854b Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LXF1b3RhLy5Pd2xCb3QueWFtbCIsImgiOiJjMzI5YzY5M2QyZGEwNjNhODllY2MyOWUxNWRjMTk2NzY5YWE4NTRiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LXJlcG9ydHMvLk93bEJvdC55YW1sIiwiaCI6ImMzMjljNjkzZDJkYTA2M2E4OWVjYzI5ZTE1ZGMxOTY3NjlhYTg1NGIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LXJldmlld3MvLk93bEJvdC55YW1sIiwiaCI6ImMzMjljNjkzZDJkYTA2M2E4OWVjYzI5ZTE1ZGMxOTY3NjlhYTg1NGIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLXR5cGUvLk93bEJvdC55YW1sIiwiaCI6ImMzMjljNjkzZDJkYTA2M2E4OWVjYzI5ZTE1ZGMxOTY3NjlhYTg1NGIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ3JhZmVhcy8uT3dsQm90LnlhbWwiLCJoIjoiYzMyOWM2OTNkMmRhMDYzYTg5ZWNjMjllMTVkYzE5Njc2OWFhODU0YiJ9 --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/packages/google-shopping-merchant-quota/setup.py b/packages/google-shopping-merchant-quota/setup.py
@@ -47,7 +47,7 @@
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
     "proto-plus >= 1.22.3, <2.0.0",
     "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
-    "protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
+    "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
 ]
 extras = {}
 url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-shopping-merchant-quota"
diff --git a/packages/google-shopping-merchant-reports/setup.py b/packages/google-shopping-merchant-reports/setup.py
@@ -47,7 +47,7 @@
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
     "proto-plus >= 1.22.3, <2.0.0",
     "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
-    "protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
+    "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
     "google-shopping-type >= 0.1.6, <1.0.0",
 ]
 extras = {}
diff --git a/packages/google-shopping-merchant-reviews/setup.py b/packages/google-shopping-merchant-reviews/setup.py
@@ -47,7 +47,7 @@
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
     "proto-plus >= 1.22.3, <2.0.0",
     "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
-    "protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
+    "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
     "google-shopping-type >= 0.1.6, <1.0.0",
 ]
 extras = {}
diff --git a/packages/google-shopping-type/setup.py b/packages/google-shopping-type/setup.py
@@ -45,7 +45,7 @@
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
     "proto-plus >= 1.22.3, <2.0.0",
     "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
-    "protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
+    "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
 ]
 extras = {}
 url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-shopping-type"
diff --git a/packages/grafeas/setup.py b/packages/grafeas/setup.py
@@ -45,7 +45,7 @@
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
     "proto-plus >= 1.22.3, <2.0.0",
     "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
-    "protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
+    "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
 ]
 extras = {}
 url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/grafeas"

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",`
`48`	`48`	`"proto-plus >= 1.22.3, <2.0.0",`
`49`	`49`	`"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",`
`50`		`- "protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",`
	`50`	`+ "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",`
`51`	`51`	`]`
`52`	`52`	`extras = {}`
`53`	`53`	`url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-shopping-merchant-quota"`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",`
`46`	`46`	`"proto-plus >= 1.22.3, <2.0.0",`
`47`	`47`	`"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",`
`48`		`- "protobuf>=3.20.2,<6.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",`
	`48`	`+ "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",`
`49`	`49`	`]`
`50`	`50`	`extras = {}`
`51`	`51`	`url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-shopping-type"`