From ec20478c8b2d21fffac5522a957d81ad92ba6eb3 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Mon, 15 Jun 2026 17:54:24 +0000
Subject: [PATCH 1/2] tests: fix compatibility with pytest 9.1.0

---
 .../tests/unit/test_python_version_support.py | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/google-api-core/tests/unit/test_python_version_support.py b/packages/google-api-core/tests/unit/test_python_version_support.py
index 07620934c93f..5775fcf099f3 100644
--- a/packages/google-api-core/tests/unit/test_python_version_support.py
+++ b/packages/google-api-core/tests/unit/test_python_version_support.py
@@ -12,20 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
 import datetime
 import textwrap
 import warnings
 from collections import namedtuple
-
 from unittest.mock import patch
 
+import pytest
+
 # Code to be tested
 from google.api_core._python_version_support import (
+    PYTHON_VERSION_INFO,
+    PythonVersionStatus,
     _flatten_message,
     check_python_version,
-    PythonVersionStatus,
-    PYTHON_VERSION_INFO,
 )
 
 # Helper object for mocking sys.version_info
@@ -67,8 +67,10 @@ def _create_failure_message(
 
 def generate_tracked_version_test_cases():
     """
-    Yields test parameters for all tracked versions and boundary conditions.
+    Returns a list of test parameters for all tracked versions and boundary conditions.
     """
+    results = []
+
     for version_tuple, version_info in PYTHON_VERSION_INFO.items():
         py_version_str = f"{version_tuple[0]}.{version_tuple[1]}"
         gapic_dep = version_info.gapic_deprecation or (
@@ -111,15 +113,18 @@ def generate_tracked_version_test_cases():
         }
 
         for name, params in test_cases.items():
-            yield pytest.param(
-                version_tuple,
-                params["date"],
-                params["expected"],
-                gapic_dep,
-                gapic_end,
-                eol_warning_starts,
-                id=f"{py_version_str}-{name}",
+            results.append(
+                pytest.param(
+                    version_tuple,
+                    params["date"],
+                    params["expected"],
+                    gapic_dep,
+                    gapic_end,
+                    eol_warning_starts,
+                    id=f"{py_version_str}-{name}",
+                )
             )
+    return results
 
 
 @pytest.mark.parametrize(

From dc07345e88d979f751c012a21ef89161ceb90209 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Mon, 15 Jun 2026 18:21:53 +0000
Subject: [PATCH 2/2] address review feedback

---
 .../google-api-core/tests/unit/test_python_version_support.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/google-api-core/tests/unit/test_python_version_support.py b/packages/google-api-core/tests/unit/test_python_version_support.py
index 5775fcf099f3..e6856c436d62 100644
--- a/packages/google-api-core/tests/unit/test_python_version_support.py
+++ b/packages/google-api-core/tests/unit/test_python_version_support.py
@@ -65,7 +65,7 @@ def _create_failure_message(
     )
 
 
-def generate_tracked_version_test_cases():
+def get_tracked_version_test_cases():
     """
     Returns a list of test parameters for all tracked versions and boundary conditions.
     """
@@ -129,7 +129,7 @@ def generate_tracked_version_test_cases():
 
 @pytest.mark.parametrize(
     "version_tuple, mock_date, expected_status, gapic_dep, gapic_end, eol_warning_starts",
-    generate_tracked_version_test_cases(),
+    get_tracked_version_test_cases(),
 )
 def test_all_tracked_versions_and_date_scenarios(
     version_tuple, mock_date, expected_status, gapic_dep, gapic_end, eol_warning_starts