chore: bump minimum version of protobuf to

Author: ohmayr

google/api_core/grpc_helpers.py

@@ -26,27 +26,6 @@
 import google.auth.credentials
 import google.auth.transport.grpc
 import google.auth.transport.requests
-import google.protobuf
-
-PROTOBUF_VERSION = google.protobuf.__version__
-
-# The grpcio-gcp package only has support for protobuf < 4
-if PROTOBUF_VERSION[0:2] == "3.":  # pragma: NO COVER
-    try:
-        import grpc_gcp
-
-        warnings.warn(
-            """Support for grpcio-gcp is deprecated. This feature will be
-            removed from `google-api-core` after January 1, 2024. If you need to
-            continue to use this feature, please pin to a specific version of
-            `google-api-core`.""",
-            DeprecationWarning,
-        )
-        HAS_GRPC_GCP = True
-    except ImportError:
-        HAS_GRPC_GCP = False
-else:
-    HAS_GRPC_GCP = False
 
 
 # The list of gRPC Callable interfaces that return iterators.

google/api_core/operations_v1/transports/base.py

@@ -235,8 +235,8 @@ def _convert_protobuf_message_to_dict(
             A dict representation of the protocol buffer message.
         """
         # TODO(https://github.com/googleapis/python-api-core/issues/643): For backwards compatibility
-        # with protobuf 3.x 4.x, Remove once support for protobuf 3.x and 4.x is dropped.
-        if PROTOBUF_VERSION[0:2] in ["3.", "4."]:
+        # with protobuf 4.x, Remove once support for protobuf 4.x is dropped.
+        if PROTOBUF_VERSION[0:2] == "4.":
             result = json_format.MessageToDict(
                 message,
                 preserving_proto_field_name=True,

noxfile.py

@@ -225,25 +225,6 @@ def unit_w_prerelease_deps(session):
     default(session, prerelease=True)
 
 
-@nox.session(python=PYTHON_VERSIONS)
-def unit_grpc_gcp(session):
-    """
-    Run the unit test suite with grpcio-gcp installed.
-    `grpcio-gcp` doesn't support protobuf 4+.
-    Remove extra `grpcgcp` when protobuf 3.x is dropped.
-    https://github.com/googleapis/python-api-core/issues/594
-    """
-    constraints_path = str(
-        CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
-    )
-    # Install grpcio-gcp
-    session.install("-e", ".[grpcgcp]", "-c", constraints_path)
-    # Install protobuf < 4.0.0
-    session.install("protobuf<4.0.0")
-
-    default(session)
-
-
 @nox.session(python=PYTHON_VERSIONS)
 def unit_wo_grpc(session):
     """Run the unit test suite w/o grpcio installed"""

pyproject.toml

@@ -45,7 +45,7 @@ classifiers = [
 ]
 dependencies = [
   "googleapis-common-protos >= 1.56.2, < 2.0.0",
-  "protobuf >= 3.19.5, < 7.0.0, != 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 >= 4.25.8, < 7.0.0, != 3.20.0, != 3.20.1, != 4.21.0, != 4.21.1, != 4.21.2, != 4.21.3, != 4.21.4, != 4.21.5",
   "proto-plus >= 1.22.3, < 2.0.0",
   "proto-plus >= 1.25.0, < 2.0.0; python_version >= '3.13'",
   "google-auth >= 2.14.1, < 3.0.0",

testing/constraints-3.7.txt

@@ -6,7 +6,7 @@
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
 googleapis-common-protos==1.56.2
-protobuf==3.19.5
+protobuf==4.25.8
 google-auth==2.14.1
 requests==2.18.0
 grpcio==1.33.2

testing/constraints-3.8.txt

@@ -1,2 +1,2 @@
 googleapis-common-protos==1.56.3
-protobuf==4.21.6
+protobuf==4.25.8

testing/constraints-async-rest-3.7.txt

@@ -6,7 +6,7 @@
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
 googleapis-common-protos==1.56.2
-protobuf==3.19.5
+protobuf==4.25.8
 google-auth==2.35.0
 # from google-auth[aiohttp]
 aiohttp==3.6.2