fix: require Protobuf 6.33.5+

Author: parthea

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

@@ -603,7 +603,7 @@ replacements:
               "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",
+              "protobuf >= 6.33.5, < 8.0.0",
               "grpc-google-iam-v1 >= 0.14.0, <1.0.0",
           ],
           "protobuf": ["protobuf >= 3.20.2, < 7.0.0"],
@@ -656,7 +656,7 @@ replacements:
       grpcio==1.59.0
       grpcio-status==1.59.0
       proto-plus==1.22.3
-      protobuf==4.25.8
+      protobuf==6.33.5
       grpc-google-iam-v1==0.14.0
       opentelemetry-api==1.1.0
       requests==2.22.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

@@ -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/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,36 @@ 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
+    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/testing/constraints-3.10.txt

@@ -6,7 +6,7 @@
 # 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
+protobuf==6.33.5
 google-auth==2.14.1
 requests==2.33.0
 grpcio==1.41.0

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

@@ -6,7 +6,7 @@
 # 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
+protobuf==6.33.5
 google-auth==2.14.1
 requests==2.33.0
 grpcio==1.41.0

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

@@ -30,7 +30,7 @@
 release_status = "Development Status :: 4 - Beta"
 dependencies = [
     "google-api-core[grpc] >= 2.11.0, <3.0.0",
-    "protobuf >= 4.25.8, < 8.0.0",
+    "protobuf >= 6.33.5, < 8.0.0",
 ]
 
 # Setup boilerplate below this line.

packages/google-cloud-access-context-manager/testing/constraints-3.9.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
+protobuf==6.33.5
 google-api-core==2.11.0