fix: require Protobuf 6.33.5+

.github/workflows/gapic-generator-tests.yml

@@ -14,7 +14,7 @@ concurrency:
 
 env:
   SHOWCASE_VERSION: 0.35.0
-  PROTOC_VERSION: 3.20.2
+  PROTOC_VERSION: 33.5
   LATEST_STABLE_PYTHON: 3.14
   PRERELEASE_PYTHON: 3.15
   ALL_PYTHON: "['3.10', '3.11', '3.12', '3.13', '3.14', '3.15']"

.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml

@@ -30,6 +30,6 @@ replacements:
           # 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",
-          "google-cloud-common >= 1.0.0, <2.0.0",
+          "google-cloud-common >= 1.5.1, <2.0.0",
           "grpcio >= 1.59.0, < 2.0.0",
     count: 1

.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml

@@ -30,7 +30,7 @@ replacements:
           # 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",
-          "grpc-google-iam-v1 >=0.12.4, <1.0.0",
+          "grpc-google-iam-v1 >=0.14.2, <1.0.0",
           "grpcio >= 1.59.0, < 2.0.0",
     count: 1
   - paths: [
@@ -49,7 +49,7 @@ replacements:
           # 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",
-          "grpc-google-iam-v1 >=0.12.4, <1.0.0",
+          "grpc-google-iam-v1 >=0.14.2, <1.0.0",
           "grpcio >= 1.59.0, < 2.0.0",
     count: 1
   - paths: [
@@ -68,7 +68,7 @@ replacements:
           # 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",
-          "grafeas >= 1.7.0, <2.0",
+          "grafeas >= 1.14.1, <2.0",
           "grpcio >= 1.59.0, < 2.0.0",
     count: 1
   - paths: [
@@ -87,7 +87,7 @@ replacements:
           # 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",
-          "grpc-google-iam-v1 >=0.12.4, <1.0.0",
+          "grpc-google-iam-v1 >=0.14.2, <1.0.0",
           "grpcio >= 1.59.0, < 2.0.0",
     count: 1
   - paths: [

.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml

@@ -30,7 +30,7 @@ replacements:
           # 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",
-          "grafeas >=1.7.0, <2.0",
+          "grafeas >=1.14.1, <2.0",
           "grpcio >= 1.59.0, < 2.0.0",
     count: 1
   - paths: [

.librarian/generator-input/client-post-processing/logging-integration.yaml

@@ -41,7 +41,7 @@ replacements:
           "grpcio >= 1.59.0, < 2.0.0",
     after: |
       "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
-          "google-cloud-appengine-logging>=0.1.3, <2.0.0",
+          "google-cloud-appengine-logging>=1.6.1, <2.0.0",
           "google-cloud-audit-log >= 0.3.2, < 1.0.0",
           "google-cloud-core >= 2.0.0, <3.0.0",
           "grpc-google-iam-v1 >=0.14.2, <1.0.0",
@@ -56,7 +56,7 @@ replacements:
       grpcio==1.59.0
     after: |
       google-auth==2.14.1
-      google-cloud-appengine-logging==0.1.3
+      google-cloud-appengine-logging==1.6.1
       google-cloud-audit-log==0.3.2
       google-cloud-core==2.0.0
       grpc-google-iam-v1==0.14.2

.librarian/generator-input/client-post-processing/storage-integration.yaml

@@ -601,12 +601,11 @@ replacements:
               "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
               "grpcio-status >= 1.59.0, < 2.0.0",
               "grpcio-status >= 1.75.1, < 2.0.0; python_version >= '3.14'",
-              "proto-plus >= 1.22.3, <2.0.0; python_version < '3.13'",
-              "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
-              "protobuf >= 4.25.8, < 8.0.0",
-              "grpc-google-iam-v1 >= 0.14.0, <1.0.0",
+              "proto-plus >= 1.26.1, <2.0.0",
+              "protobuf >= 6.33.5, < 8.0.0",
+              "grpc-google-iam-v1 >= 0.14.2, <1.0.0",
           ],
-          "protobuf": ["protobuf >= 3.20.2, < 7.0.0"],
+          "protobuf": ["protobuf >= 6.33.5, < 8.0.0"],
           "tracing": [
               "opentelemetry-api >= 1.1.0, < 2.0.0",
           ],
@@ -655,9 +654,9 @@ replacements:
       google-resumable-media==2.7.2
       grpcio==1.59.0
       grpcio-status==1.59.0
-      proto-plus==1.22.3
-      protobuf==4.25.8
-      grpc-google-iam-v1==0.14.0
+      proto-plus==1.26.1
+      protobuf==6.33.5
+      grpc-google-iam-v1==0.14.2
       opentelemetry-api==1.1.0
       requests==2.22.0
       google-crc32c==1.6.0

packages/bigframes/setup.py

@@ -42,9 +42,9 @@
     "google-cloud-bigquery[bqstorage,pandas] >=3.36.0",
     # 2.30 needed for arrow support.
     "google-cloud-bigquery-storage >= 2.30.0, < 3.0.0",
-    "google-cloud-functions >=1.12.0",
-    "google-cloud-bigquery-connection >=1.12.0",
-    "google-cloud-resource-manager >=1.10.3",
+    "google-cloud-functions >=1.20.2",
+    "google-cloud-bigquery-connection >=1.18.2",
+    "google-cloud-resource-manager >=1.14.2",
     "google-cloud-storage >=2.0.0",
     "google-crc32c >=1.0.0,<2.0.0",
     "grpc-google-iam-v1 >= 0.14.2",
@@ -73,8 +73,8 @@
     "tests": [
         "freezegun",
         "pytest-snapshot",
-        "google-cloud-bigtable >=2.24.0",
-        "google-cloud-pubsub >=2.21.4",
+        "google-cloud-bigtable >=2.30.0",
+        "google-cloud-pubsub >=2.29.0",
         "tzdata",
     ],
     # used for local engine

packages/bigframes/testing/constraints-3.10.txt

@@ -4,13 +4,13 @@ fsspec==2023.3.0
 gcsfs==2023.3.0
 geopandas==0.12.2
 google-auth==2.15.0
-google-cloud-bigtable==2.24.0
-google-cloud-pubsub==2.21.4
+google-cloud-bigtable==2.30.0
+google-cloud-pubsub==2.29.0
 google-cloud-bigquery==3.36.0
-google-cloud-functions==1.12.0
-google-cloud-bigquery-connection==1.12.0
-google-cloud-iam==2.12.1
-google-cloud-resource-manager==1.10.3
+google-cloud-functions==1.20.2
+google-cloud-bigquery-connection==1.18.2
+google-cloud-iam==2.18.2
+google-cloud-resource-manager==1.14.2
 google-cloud-storage==2.0.0
 grpc-google-iam-v1==0.14.2
 numpy==1.24.0
@@ -95,7 +95,7 @@ pluggy==1.6.0
 prompt_toolkit==3.0.52
 propcache==0.4.1
 proto-plus==1.27.1
-protobuf==4.25.8
+protobuf==6.33.5
 psygnal==0.15.1
 ptyprocess==0.7.0
 pure_eval==0.2.3

packages/bigframes/testing/constraints-3.11.txt

@@ -145,7 +145,7 @@ gitdb==4.0.12
 GitPython==3.1.45
 glob2==0.7
 google==2.0.3
-google-ai-generativelanguage==0.6.15
+google-ai-generativelanguage==0.6.17
 google-api-core==2.25.1
 google-api-python-client==2.177.0
 google-auth==2.38.0
@@ -180,7 +180,7 @@ groovy==0.1.2
 grpc-google-iam-v1==0.14.2
 grpc-interceptor==0.15.4
 grpcio==1.74.0
-grpcio-status==1.71.2
+grpcio-status==1.72.1
 grpclib==0.4.8
 gspread==6.2.1
 gspread-dataframe==4.0.0
@@ -401,7 +401,7 @@ prompt_toolkit==3.0.51
 propcache==0.3.2
 prophet==1.1.7
 proto-plus==1.26.1
-protobuf==5.29.5
+protobuf==6.33.5
 psutil==5.9.5
 psycopg2==2.9.10
 psygnal==0.14.0

packages/bigquery-magics/setup.py

@@ -45,7 +45,7 @@
     # moved back to optional due to bloat.  See
     # https://github.com/googleapis/python-bigquery/issues/1196 for more background.
     "bqstorage": [
-        "google-cloud-bigquery-storage >= 2.25.0, <3.0.0",
+        "google-cloud-bigquery-storage >= 2.29.0, <3.0.0",
         # Due to an issue in pip's dependency resolver, the `grpc` extra is not
         # installed, even though `google-cloud-bigquery-storage` specifies it
         # as `google-api-core[grpc]`. We thus need to explicitly specify it here.

packages/bigquery-magics/testing/constraints-3.10.txt

@@ -8,7 +8,7 @@
 db-dtypes==1.1.1
 geopandas==1.0.1
 google-cloud-bigquery==3.41.0
-google-cloud-bigquery-storage==2.25.0
+google-cloud-bigquery-storage==2.29.0
 ipywidgets==7.7.1
 ipython==7.23.1
 ipykernel==5.5.6

packages/gapic-generator/setup.py

@@ -26,10 +26,10 @@
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
     # Ensure that the lower bounds of these dependencies match what we have in the
-    # templated setup.py.j2: https://github.com/googleapis/gapic-generator-python/blob/main/gapic/templates/setup.py.j2
+    # templated setup.py.j2: https://github.com/googleapis/google-cloud-python/blob/main/packages/gapic-generator/gapic/templates/setup.py.j2
     "click >= 6.7",
     "google-api-core[grpc] >= 2.25.0, < 3.0.0",
-    "googleapis-common-protos >= 1.55.0, < 2.0.0",
+    "googleapis-common-protos >= 1.69.2, < 2.0.0",
     "grpcio >= 1.59.0, < 2.0.0",
     # 2.11.0 is required which adds the `default` argument to `jinja-filters.map()`
     # https://jinja.palletsprojects.com/en/3.0.x/templates/#jinja-filters.map

packages/gcp-sphinx-docfx-yaml/tests/testdata/gapic-combo/setup.py

@@ -32,7 +32,7 @@
     "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
     "proto-plus >= 1.22.0, <2.0.0dev",
     "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",
-    "grpc-google-iam-v1 >=0.12.4, <1.0.0dev",
+    "grpc-google-iam-v1 >=0.14.2, <1.0.0dev",
     "grpcio-status >= 1.59.0, < 2.0.0",
 ]
 extras = {"libcst": "libcst >= 0.3.10"}

packages/google-api-core/google/api_core/_python_package_support.py

@@ -35,7 +35,7 @@
 _PACKAGE_DEPENDENCY_WARNINGS = [
     DependencyConstraint(
         "google.protobuf",
-        minimum_fully_supported_version="4.25.8",
+        minimum_fully_supported_version="6.33.5",
         recommended_version="6.x",
     )
 ]
@@ -50,7 +50,7 @@
 def parse_version_to_tuple(version_string: str) -> ParsedVersion:
     """Safely converts a semantic version string to a comparable tuple of integers.
 
-    Example: "4.25.8" -> (4, 25, 8)
+    Example: "6.33.5" -> (6, 33, 5)
     Ignores non-numeric parts and handles common version formats.
 
     Args:

packages/google-api-core/noxfile.py

@@ -307,51 +307,28 @@ def default(
 
 @nox.session(python=ALL_PYTHON)
 @nox.parametrize(
-    ["install_grpc", "install_async_rest", "python_versions", "legacy_proto"],
+    ["install_grpc", "install_async_rest", "python_versions"],
     [
-        (True, False, None, None),  # Run unit tests with grpcio installed
-        (False, False, None, None),  # Run unit tests without grpcio installed
+        (True, False, None),  # Run unit tests with grpcio installed
+        (False, False, None),  # Run unit tests without grpcio installed
         (
             True,
             True,
             None,
-            None,
         ),  # Run unit tests with grpcio and async rest installed
-        # TODO: Remove once we stop support for protobuf 4.x.
-        (
-            True,
-            False,
-            ["3.10", "3.11"],
-            4,
-        ),  # Run proto4 tests with grpcio/grpcio-gcp installed
     ],
 )
-def unit(
-    session, install_grpc, install_async_rest, python_versions=None, legacy_proto=None
-):
+def unit(session, install_grpc, install_async_rest, python_versions=None):
     """Run the unit test suite with the given configuration parameters.
 
     If `python_versions` is provided, the test suite only runs when the Python version (xx.yy) is
     one of the values in `python_versions`.
-
-    If `legacy_proto` is provided, this test suite will explicitly install the proto library at
-    that major version. Only a few values are supported at any one time; the intent is to test
-    deprecated but noyet abandoned versions.
     """
 
     if python_versions and session.python not in python_versions:
         session.log(f"Skipping session for Python {session.python}")
         session.skip()
 
-    match legacy_proto:
-        case 4:
-            # Pin protobuf to a 4.x version to ensure coverage for the legacy code path.
-            session.install("protobuf>=4.25.8,<5.0.0")
-        case None | False:
-            pass
-        case _:
-            assert False, f"Unknown legacy_proto: {legacy_proto}"
-
     default(
         session=session,
         install_grpc=install_grpc,

packages/google-api-core/pyproject.toml

@@ -43,10 +43,9 @@ classifiers = [
   "Topic :: Internet",
 ]
 dependencies = [
-  "googleapis-common-protos >= 1.63.2, < 2.0.0",
-  "protobuf >= 5.29.6, < 8.0.0",
-  "proto-plus >= 1.24.0, < 2.0.0",
-  "proto-plus >= 1.25.0, < 2.0.0; python_version >= '3.13'",
+  "googleapis-common-protos >= 1.69.2, < 2.0.0",
+  "protobuf >= 6.33.5, < 8.0.0",
+  "proto-plus >= 1.26.1, < 2.0.0",
   "google-auth >= 2.14.1, < 3.0.0",
   "requests >= 2.33.0, < 3.0.0",
 ]

packages/google-api-core/testing/constraints-3.10.txt

@@ -5,10 +5,10 @@
 #
 # e.g., if pyproject.toml has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
-googleapis-common-protos==1.63.2
-protobuf==5.29.6
+googleapis-common-protos==1.69.2
+protobuf==6.33.5
 google-auth==2.14.1
 requests==2.33.0
 grpcio==1.59.0
 grpcio-status==1.59.0
-proto-plus==1.24.0
+proto-plus==1.26.1

packages/google-api-core/testing/constraints-async-rest-3.10.txt

@@ -5,11 +5,11 @@
 #
 # e.g., if pyproject.toml has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
-googleapis-common-protos==1.63.2
-protobuf==5.29.6
+googleapis-common-protos==1.69.2
+protobuf==6.33.5
 google-auth==2.14.1
 requests==2.33.0
 grpcio==1.59.0
 grpcio-status==1.59.0
-proto-plus==1.24.0
+proto-plus==1.26.1
 aiohttp==3.13.4

packages/google-auth-httplib2/setup.py

@@ -19,7 +19,7 @@
 version = "0.4.0"
 
 DEPENDENCIES = [
-    "google-auth >= 1.32.0,<3.0.0",
+    "google-auth >= 2.14.1, <3.0.0",
     "httplib2 >= 0.19.0,<1.0.0",
 ]
 

packages/google-auth-httplib2/testing/constraints-3.10.txt

@@ -5,5 +5,5 @@
 #
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
-google-auth==1.32.0
+google-auth==2.14.1
 httplib2==0.19.0

packages/google-cloud-access-context-manager/setup.py

@@ -29,8 +29,8 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = "Development Status :: 4 - Beta"
 dependencies = [
-    "google-api-core[grpc] >= 2.11.0, <3.0.0",
-    "protobuf >= 4.25.8, < 8.0.0",
+    "google-api-core[grpc] >= 2.25.0, <3.0.0",
+    "protobuf >= 6.33.5, < 8.0.0",
 ]
 
 # Setup boilerplate below this line.

packages/google-cloud-access-context-manager/testing/constraints-3.10.txt

@@ -5,5 +5,5 @@
 #
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
-protobuf==4.25.8
-google-api-core==2.11.0
+protobuf==6.33.5
+google-api-core==2.25.0

packages/google-cloud-audit-log/setup.py

@@ -23,8 +23,8 @@
 version = "0.6.0"
 release_status = "Development Status :: 4 - Beta"
 dependencies = [
-    "protobuf >= 4.25.8, < 8.0.0",
-    "googleapis-common-protos >= 1.56.2, < 2.0.0",
+    "protobuf >= 6.33.5, < 8.0.0",
+    "googleapis-common-protos >= 1.69.2, < 2.0.0",
 ]
 
 package_root = os.path.abspath(os.path.dirname(__file__))