Recommend protobuf 6.x

vchudnov-g · vchudnov-g · commit ac8c4121464a · 2025-10-01T12:35:34.000-07:00
diff --git a/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2
@@ -70,13 +70,15 @@ else:   # pragma: NO COVER
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py b/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py
@@ -73,13 +73,15 @@ def _get_version(dependency_name):
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
diff --git a/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py b/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py
@@ -73,13 +73,15 @@ def _get_version(dependency_name):
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
diff --git a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py
@@ -73,13 +73,15 @@ def _get_version(dependency_name):
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py b/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py
@@ -73,13 +73,15 @@ def _get_version(dependency_name):
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
diff --git a/tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py b/tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py
@@ -73,13 +73,15 @@ def _get_version(dependency_name):
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py b/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py
@@ -73,13 +73,15 @@ def _get_version(dependency_name):
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
diff --git a/tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py b/tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py
@@ -73,13 +73,15 @@ def _get_version(dependency_name):
     _dependency_package = "google.protobuf"
     _next_supported_version = "4.25.8"
     _next_supported_version_tuple = (4, 25, 8)
+    _recommendation = " (we recommend 6.x)"
     (_version_used, _version_used_string) = _get_version(_dependency_package)
     if _version_used and _version_used < _next_supported_version_tuple:
         warnings.warn(f"Package {_package_label} depends on " +
                       f"{_dependency_package}, currently installed at version " +
                       f"{_version_used_string}. Future updates to " +
                       f"{_package_label} will require {_dependency_package} at " +
-                      f"version {_next_supported_version} or higher. Please ensure " +
+                      f"version {_next_supported_version} or higher{recommendation}." +
+                      " Please ensure " +
                       "that either (a) your Python environment doesn't pin the " +
                       f"version of {_dependency_package}, so that updates to " +
                       f"{_package_label} can require the higher version, or " +
