try setting future warning

vchudnov-g · vchudnov-g · commit 8a1024b11384 · 2025-09-12T15:24:27.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
@@ -34,14 +34,16 @@ else:   # pragma: NO COVER
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -80,7 +82,8 @@ else:   # pragma: NO COVER
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 {#  Import subpackages. -#}
 {% for subpackage, _ in api.subpackages|dictsort %}
diff --git a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
@@ -1494,7 +1494,7 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_client_cert_s
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py b/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py
@@ -37,14 +37,16 @@
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -83,7 +85,8 @@ def _get_version(dependency_name):
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 
 from .services.asset_service import AssetServiceClient
diff --git a/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py b/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py
@@ -17734,7 +17734,7 @@ def test_asset_service_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py b/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py
@@ -37,14 +37,16 @@
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -83,7 +85,8 @@ def _get_version(dependency_name):
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 
 from .services.iam_credentials import IAMCredentialsClient
diff --git a/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py b/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py
@@ -3994,7 +3994,7 @@ def test_iam_credentials_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py
@@ -37,14 +37,16 @@
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -83,7 +85,8 @@ def _get_version(dependency_name):
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 
 from .services.eventarc import EventarcClient
diff --git a/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py b/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py
@@ -15400,7 +15400,7 @@ def test_eventarc_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py b/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py
@@ -37,14 +37,16 @@
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -83,7 +85,8 @@ def _get_version(dependency_name):
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 
 from .services.config_service_v2 import ConfigServiceV2Client
diff --git a/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py b/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py
@@ -12919,7 +12919,7 @@ def test_config_service_v2_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py
@@ -3467,7 +3467,7 @@ def test_logging_service_v2_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py
@@ -3271,7 +3271,7 @@ def test_metrics_service_v2_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
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
@@ -37,14 +37,16 @@
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -83,7 +85,8 @@ def _get_version(dependency_name):
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 
 from .services.config_service_v2 import BaseConfigServiceV2Client
diff --git a/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py b/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py
@@ -12919,7 +12919,7 @@ def test_config_service_v2_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py
@@ -3467,7 +3467,7 @@ def test_logging_service_v2_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py
@@ -3271,7 +3271,7 @@ def test_metrics_service_v2_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py b/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py
@@ -37,14 +37,16 @@
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -83,7 +85,8 @@ def _get_version(dependency_name):
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 
 from .services.cloud_redis import CloudRedisClient
diff --git a/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py b/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py
@@ -11679,7 +11679,7 @@ def test_cloud_redis_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"
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
@@ -37,14 +37,16 @@
                       f"({_py_version_str}).  Google will not post any further " +
                       f"updates to {_package_label} supporting this Python version. " +
                       "Please upgrade to the latest Python version, or at " +
-                      f"least to Python 3.9, and then update {_package_label}.")
+                      f"least to Python 3.9, and then update {_package_label}.",
+                      FutureWarning)
     if sys.version_info[:2] == (3, 9):
         warnings.warn(f"You are using a Python version ({_py_version_str}) " +
                       f"which Google will stop supporting in {_package_label} when " +
                       "it reaches its end of life (October 2025). Please " +
                       "upgrade to the latest Python version, or at " +
                       "least Python 3.10, before then, and " +
-                      f"then update {_package_label}.")
+                      f"then update {_package_label}.",
+                      FutureWarning)
 
     from packaging.version import parse as parse_version
 
@@ -83,7 +85,8 @@ def _get_version(dependency_name):
                       f"{_package_label} can require the higher version, or " +
                       "(b) you manually update your Python environment to use at " +
                       f"least version {_next_supported_version} of " +
-                      f"{_dependency_package}.")
+                      f"{_dependency_package}.",
+                      FutureWarning)
 
 
 from .services.cloud_redis import CloudRedisClient
diff --git a/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py b/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py
@@ -6845,7 +6845,7 @@ def test_cloud_redis_transport_channel_mtls_with_client_cert_source(
                         client_cert_source=client_cert_source_callback,
                     )
                     adc.assert_called_once()
-            assert len(record) == record # 2 just for debugging; REMOVE
+            assert len(record) == 2
 
             grpc_ssl_channel_cred.assert_called_once_with(
                 certificate_chain=b"cert bytes", private_key=b"key bytes"

Original file line number	Diff line number	Diff line change
`@@ -1494,7 +1494,7 @@ def test_{{ service.name\|snake_case }}_transport_channel_mtls_with_client_cert_s`
`1494`	`1494`	`client_cert_source=client_cert_source_callback,`
`1495`	`1495`	`)`
`1496`	`1496`	`adc.assert_called_once()`
`1497`		`- assert len(record) == record # 2 just for debugging; REMOVE`
	`1497`	`+ assert len(record) == 2`
`1498`	`1498`
`1499`	`1499`	`grpc_ssl_channel_cred.assert_called_once_with(`
`1500`	`1500`	`certificate_chain=b"cert bytes", private_key=b"key bytes"`
Original file line number	Diff line number	Diff line change
`@@ -17734,7 +17734,7 @@ def test_asset_service_transport_channel_mtls_with_client_cert_source(`
`17734`	`17734`	`client_cert_source=client_cert_source_callback,`
`17735`	`17735`	`)`
`17736`	`17736`	`adc.assert_called_once()`
`17737`		`- assert len(record) == record # 2 just for debugging; REMOVE`
	`17737`	`+ assert len(record) == 2`
`17738`	`17738`
`17739`	`17739`	`grpc_ssl_channel_cred.assert_called_once_with(`
`17740`	`17740`	`certificate_chain=b"cert bytes", private_key=b"key bytes"`
Original file line number	Diff line number	Diff line change
`@@ -3994,7 +3994,7 @@ def test_iam_credentials_transport_channel_mtls_with_client_cert_source(`
`3994`	`3994`	`client_cert_source=client_cert_source_callback,`
`3995`	`3995`	`)`
`3996`	`3996`	`adc.assert_called_once()`
`3997`		`- assert len(record) == record # 2 just for debugging; REMOVE`
	`3997`	`+ assert len(record) == 2`
`3998`	`3998`
`3999`	`3999`	`grpc_ssl_channel_cred.assert_called_once_with(`
`4000`	`4000`	`certificate_chain=b"cert bytes", private_key=b"key bytes"`
Original file line number	Diff line number	Diff line change
`@@ -15400,7 +15400,7 @@ def test_eventarc_transport_channel_mtls_with_client_cert_source(`
`15400`	`15400`	`client_cert_source=client_cert_source_callback,`
`15401`	`15401`	`)`
`15402`	`15402`	`adc.assert_called_once()`
`15403`		`- assert len(record) == record # 2 just for debugging; REMOVE`
	`15403`	`+ assert len(record) == 2`
`15404`	`15404`
`15405`	`15405`	`grpc_ssl_channel_cred.assert_called_once_with(`
`15406`	`15406`	`certificate_chain=b"cert bytes", private_key=b"key bytes"`
Original file line number	Diff line number	Diff line change
`@@ -12919,7 +12919,7 @@ def test_config_service_v2_transport_channel_mtls_with_client_cert_source(`
`12919`	`12919`	`client_cert_source=client_cert_source_callback,`
`12920`	`12920`	`)`
`12921`	`12921`	`adc.assert_called_once()`
`12922`		`- assert len(record) == record # 2 just for debugging; REMOVE`
	`12922`	`+ assert len(record) == 2`
`12923`	`12923`
`12924`	`12924`	`grpc_ssl_channel_cred.assert_called_once_with(`
`12925`	`12925`	`certificate_chain=b"cert bytes", private_key=b"key bytes"`