Fix messaegs and test

Author: vchudnov-g

google/api_core/_python_package_support.py

@@ -110,7 +110,8 @@ def warn_deprecation_for_versions_less_than(
             dependent_distribution_package,
         ) = _get_distribution_and_import_packages(dependent_import_package)
         message_template = message_template or _flatten_message(
-            """DEPRECATION: Package {dependent_packages} depends on
+            """
+            DEPRECATION: Package {dependent_packages} depends on
             {dependency_packages}, currently installed at version
             {version_used.__str__}. Future updates to
             {dependent_packages} will require {dependency_packages} at
@@ -120,12 +121,15 @@ def warn_deprecation_for_versions_less_than(
             {dependent_packages} can require the higher version, or
             (b) you manually update your Python environment to use at
             least version {next_supported_version} of
-            {dependency_packages}."""
+            {dependency_packages}.
+            """
         )
         logging.warning(
             message_template.format(
                 dependent_import_package=dependent_import_package,
                 dependency_import_package=dependency_import_package,
+                dependency_packages=dependency_packages,
+                dependent_packages=dependent_packages,
                 next_supported_version=next_supported_version,
                 version_used=version_used,
             )

google/api_core/_python_version_support.py

@@ -185,36 +185,42 @@ def min_python(date: datetime.date) -> str:
 
     if gapic_end < today:
         message = _flatten_message(
-            f"""You are using a non-supported Python version
+            f"""
+            You are using a non-supported Python version
             ({py_version_str}).  Google will not post any further
             updates to {package_label}. We suggest you upgrade to the
             latest Python version, or at least Python
-            {min_python(today)}, and then update {package_label}. """
+            {min_python(today)}, and then update {package_label}.
+            """
         )
         logging.warning(message)
         return PythonVersionStatus.PYTHON_VERSION_UNSUPPORTED
 
     eol_date = version_info.python_eol + EOL_GRACE_PERIOD
     if eol_date <= today <= gapic_end:
         message = _flatten_message(
-            f"""You are using a Python version ({py_version_str})
+            f"""
+            You are using a Python version ({py_version_str})
             past its end of life. Google will update {package_label}
             with critical bug fixes on a best-effort basis, but not
             with any other fixes or features. We suggest you upgrade
             to the latest Python version, or at least Python
-            {min_python(today)}, and then update {package_label}."""
+            {min_python(today)}, and then update {package_label}.
+            """
         )
         logging.warning(message)
         return PythonVersionStatus.PYTHON_VERSION_EOL
 
     if gapic_deprecation <= today <= gapic_end:
         message = _flatten_message(
-            f"""You are using a Python version ({py_version_str}),
+            f"""
+            You are using a Python version ({py_version_str}),
             which Google will stop supporting in {package_label} when
             it reaches its end of life ({version_info.python_eol}). We
             suggest you upgrade to the latest Python version, or at
             least Python {min_python(version_info.python_eol)}, and
-            then update {package_label}."""
+            then update {package_label}.
+            """
         )
         logging.warning(message)
         return PythonVersionStatus.PYTHON_VERSION_DEPRECATED

tests/unit/test_python_package_support.py

@@ -54,46 +54,63 @@ def test_get_dependency_version_py37(mock_get_distribution):
     assert get_dependency_version("not-a-package") is None
 
 
+@patch("google.api_core._python_package_support._get_distribution_and_import_packages")
 @patch("google.api_core._python_package_support.get_dependency_version")
 @patch("google.api_core._python_package_support.logging.warning")
-def test_warn_deprecation_for_versions_less_than(mock_log_warning, mock_get_version):
+def test_warn_deprecation_for_versions_less_than(
+    mock_log_warning, mock_get_version, mock_get_packages
+):
     """Test the deprecation warning logic."""
+    # Mock the helper function to return predictable package strings
+    mock_get_packages.side_effect = [
+        ("dep-package (dep.package)", "dep-package"),
+        ("my-package (my.package)", "my-package"),
+    ]
+
     # Case 1: Installed version is less than required, should warn.
     mock_get_version.return_value = parse_version("1.0.0")
-    warn_deprecation_for_versions_less_than("my-package", "dep-package", "2.0.0")
+    warn_deprecation_for_versions_less_than("my.package", "dep.package", "2.0.0")
     mock_log_warning.assert_called_once()
     assert (
-        "DEPRECATION: Package my-package depends on dep-package"
+        "DEPRECATION: Package my-package (my.package) depends on dep-package (dep.package)"
         in mock_log_warning.call_args[0][0]
     )
 
     # Case 2: Installed version is equal to required, should not warn.
     mock_log_warning.reset_mock()
+    mock_get_packages.reset_mock()
     mock_get_version.return_value = parse_version("2.0.0")
-    warn_deprecation_for_versions_less_than("my-package", "dep-package", "2.0.0")
+    warn_deprecation_for_versions_less_than("my.package", "dep.package", "2.0.0")
     mock_log_warning.assert_not_called()
 
     # Case 3: Installed version is greater than required, should not warn.
     mock_log_warning.reset_mock()
+    mock_get_packages.reset_mock()
     mock_get_version.return_value = parse_version("3.0.0")
-    warn_deprecation_for_versions_less_than("my-package", "dep-package", "2.0.0")
+    warn_deprecation_for_versions_less_than("my.package", "dep.package", "2.0.0")
     mock_log_warning.assert_not_called()
 
     # Case 4: Dependency not found, should not warn.
     mock_log_warning.reset_mock()
+    mock_get_packages.reset_mock()
     mock_get_version.return_value = None
-    warn_deprecation_for_versions_less_than("my-package", "dep-package", "2.0.0")
+    warn_deprecation_for_versions_less_than("my.package", "dep.package", "2.0.0")
     mock_log_warning.assert_not_called()
 
     # Case 5: Custom message template.
     mock_log_warning.reset_mock()
+    mock_get_packages.reset_mock()
+    mock_get_packages.side_effect = [
+        ("dep-package (dep.package)", "dep-package"),
+        ("my-package (my.package)", "my-package"),
+    ]
     mock_get_version.return_value = parse_version("1.0.0")
-    template = "Custom warning for {dependency_name} used by {dependent_package}."
+    template = "Custom warning for {dependency_packages} used by {dependent_packages}."
     warn_deprecation_for_versions_less_than(
-        "my-package", "dep-package", "2.0.0", message_template=template
+        "my.package", "dep.package", "2.0.0", message_template=template
     )
     mock_log_warning.assert_called_once()
     assert (
-        "Custom warning for dep-package used by my-package."
+        "Custom warning for dep-package (dep.package) used by my-package (my.package)."
         in mock_log_warning.call_args[0][0]
     )