Require google-api-core>=2.11.0 to allow protobuf>=4.25.8

vchudnov-g · vchudnov-g · commit e1a9b98296c4 · 2026-02-05T13:50:05.000-08:00
Otherwise we get a dependency conflict in the fragment tests.
diff --git a/gapic/templates/setup.py.j2 b/gapic/templates/setup.py.j2
@@ -33,7 +33,7 @@ else:
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/gapic/templates/testing/constraints-3.9.txt.j2 b/gapic/templates/testing/constraints-3.9.txt.j2
@@ -2,11 +2,11 @@
 {% from '_pypi_packages.j2' import pypi_packages %}
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
diff --git a/tests/integration/goldens/asset/setup.py b/tests/integration/goldens/asset/setup.py
@@ -39,7 +39,7 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/tests/integration/goldens/asset/testing/constraints-3.9.txt b/tests/integration/goldens/asset/testing/constraints-3.9.txt
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
diff --git a/tests/integration/goldens/credentials/setup.py b/tests/integration/goldens/credentials/setup.py
@@ -39,7 +39,7 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/tests/integration/goldens/credentials/testing/constraints-3.9.txt b/tests/integration/goldens/credentials/testing/constraints-3.9.txt
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
diff --git a/tests/integration/goldens/eventarc/setup.py b/tests/integration/goldens/eventarc/setup.py
@@ -39,7 +39,7 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.9.txt b/tests/integration/goldens/eventarc/testing/constraints-3.9.txt
@@ -2,11 +2,10 @@
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
 # List all library dependencies and extras in this file.
- grpc-google-iam-v1
 # Pin the version to the lower bound.
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
 # Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.9.txt~ b/tests/integration/goldens/eventarc/testing/constraints-3.9.txt~
@@ -1,27 +1,27 @@
 # -*- coding: utf-8 -*-
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
 <<<<<<< conflict 1 of 1
-%%%%%%% diff from: kyqlvtkx ef41a402 "Update protobuf dependency in ads template" (parents of rebased revision)
-\\\\\\\        to: kyqlvtkx ef41a402 "Update protobuf dependency in ads template" (rebased revision)
- google-api-core
- google-auth
- grpcio
- proto-plus
- protobuf
-+# cryptography is a direct dependency of google-auth
-+cryptography
- grpc-google-iam-v1
-+++++++ zysqyomp 15cd6d4a "Update goldens" (rebased revision)
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+%%%%%%% diff from: qvnlxwmk ec800d7a "Allow protobuf 6.x" (rebased revision)
+\\\\\\\        to: mrtsuqst bb734c37 "Allow protobuf 6.x" (rebase destination)
+ # List all library dependencies and extras in this file.
++ grpc-google-iam-v1
+ # Pin the version to the lower bound.
+ # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+ # Then this file should have google-cloud-foo==1.14.0
+ google-api-core==1.34.1
++++++++ ppyqnrkr 85365cff "Require google-api-core>=2.11.0 to allow protobuf>=4.25.8" (rebased revision)
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
+>>>>>>> conflict 1 of 1 ends
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
 proto-plus==1.22.3
 protobuf==4.25.8
+# cryptography is a direct dependency of google-auth
+cryptography
 grpc-google-iam-v1==0.14.0
->>>>>>> conflict 1 of 1 ends
diff --git a/tests/integration/goldens/logging/setup.py b/tests/integration/goldens/logging/setup.py
@@ -39,7 +39,7 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/tests/integration/goldens/logging/testing/constraints-3.9.txt b/tests/integration/goldens/logging/testing/constraints-3.9.txt
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
diff --git a/tests/integration/goldens/logging_internal/setup.py b/tests/integration/goldens/logging_internal/setup.py
@@ -39,7 +39,7 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/tests/integration/goldens/logging_internal/testing/constraints-3.9.txt b/tests/integration/goldens/logging_internal/testing/constraints-3.9.txt
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
diff --git a/tests/integration/goldens/redis/setup.py b/tests/integration/goldens/redis/setup.py
@@ -39,7 +39,7 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/tests/integration/goldens/redis/testing/constraints-3.9.txt b/tests/integration/goldens/redis/testing/constraints-3.9.txt
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
diff --git a/tests/integration/goldens/redis_selective/setup.py b/tests/integration/goldens/redis_selective/setup.py
@@ -39,7 +39,7 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-api-core[grpc] >= 2.11.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
diff --git a/tests/integration/goldens/redis_selective/testing/constraints-3.9.txt b/tests/integration/goldens/redis_selective/testing/constraints-3.9.txt
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This constraints file is used to check that lower bounds
 # are correct in setup.py
-# List all library dependencies and extras in this file.
-# Pin the version to the lower bound.
-# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
-# Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.34.1
+# List all library dependencies and extras in this file,
+# pinning their versions to their lower bounds.
+# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# then this file should have google-cloud-foo==1.14.0
+google-api-core==2.11.0
 google-auth==2.35.0
 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453)
 # Add the minimum supported version of grpcio to constraints files
