chore: fix comments and exported function

Author: vchudnov-g

google/api_core/__init__.py

@@ -32,3 +32,5 @@
 
 check_dependency_versions = _python_package_support.check_dependency_versions
 check_dependency_versions("google.api_core")
+
+warn_deprecation_for_versions_less_than = _python_package_support.warn_deprecation_for_versions_less_than

google/api_core/_python_package_support.py

@@ -22,7 +22,6 @@
     _get_distribution_and_import_packages,
 )
 
-# It is a good practice to alias the Version class for clarity in type hints.
 from packaging.version import parse as parse_version, Version as PackagingVersion
 
 
@@ -72,24 +71,28 @@ def warn_deprecation_for_versions_less_than(
     `next_supported_version`, this issues a warning using either a
     default `message_template` or one provided by the user. The
     default `message_template` informs the user that they will not receive
-    future updates `dependent_import_package` if
+    future updates for `dependent_import_package` if
     `dependency_import_package` is somehow pinned to a version lower
     than `next_supported_version`.
 
     Args:
       dependent_import_package: The import name of the package that
         needs `dependency_import_package`.
       dependency_import_package: The import name of the dependency to check.
-      next_supported_version: The version number below which a deprecation
-        warning will be logged.
+      next_supported_version: The dependency_import_package version number
+        below which a deprecation warning will be logged.
       message_template: A custom default message template to replace
         the default. This `message_template` is treated as an
         f-string, where the following variables are defined:
         `dependency_import_package`, `dependent_import_package` and
-        `dependency_package`, `dependent_package`, which contain both the
-         import and distribution packages for the dependency and the dependent,
-         respectively; and `next_supported_version` and `version_used`, which
-         refer to supported and currently-used versions of the dependency.
+        `dependency_distribution_package` and
+        `dependent_distribution_package` and `dependency_package`,
+        `dependent_package` , which contain the import packages, the
+        distribution packages, and pretty string with both the
+        distribution and import packages for the dependency and the
+        dependent, respectively; and `next_supported_version` and
+        `version_used`, which refer to supported and currently-used
+        versions of the dependency.
 
     """
     if (
@@ -129,6 +132,8 @@ def warn_deprecation_for_versions_less_than(
             message_template.format(
                 dependent_import_package=dependent_import_package,
                 dependency_import_package=dependency_import_package,
+                dependent_distribution_package=dependent_distribution_package,
+                dependency_distribution_package=dependency_distribution_package,
                 dependency_package=dependency_package,
                 dependent_package=dependent_package,
                 next_supported_version=next_supported_version,

google/api_core/_python_version_support.py

@@ -96,11 +96,12 @@ class VersionInfo(NamedTuple):
 
 
 def _flatten_message(text: str) -> str:
-    """Dedent a multi-line string and flattens it into a single line."""
+    """Dedent a multi-line string and flatten it into a single line."""
     return textwrap.dedent(text).strip().replace("\n", " ")
 
 
-# TODO: Remove once we no longer support Python 3.7
+# TODO(https://github.com/googleapis/python-api-core/issues/835): Remove once we
+# no longer support Python 3.7
 if sys.version_info < (3, 8):
 
     def _get_pypi_package_name(module_name):  # pragma: NO COVER

tests/unit/test_python_package_support.py

@@ -24,6 +24,8 @@
 )
 
 
+# TODO(https://github.com/googleapis/python-api-core/issues/835): Remove
+# this mark once we drop support for Python 3.7
 @pytest.mark.skipif(sys.version_info < (3, 8), reason="requires python3.8 or higher")
 @patch("importlib.metadata.version")
 def test_get_dependency_version_py38_plus(mock_version):
@@ -37,6 +39,8 @@ def test_get_dependency_version_py38_plus(mock_version):
     assert get_dependency_version("not-a-package") is None
 
 
+# TODO(https://github.com/googleapis/python-api-core/issues/835): Remove
+# this test function once we drop support for Python 3.7
 @pytest.mark.skipif(sys.version_info >= (3, 8), reason="requires python3.7")
 @patch("pkg_resources.get_distribution")
 def test_get_dependency_version_py37(mock_get_distribution):

tests/unit/test_python_version_support.py

@@ -162,6 +162,10 @@ def test_override_gapic_end_only():
             "google.api_core._python_version_support.PYTHON_VERSION_INFO",
             {version_tuple: overridden_info},
         ):
+            result_before_boundary = check_python_version(
+                today=custom_gapic_end + datetime.timedelta(days=-1))
+            assert result_before_boundary == PythonVersionStatus.PYTHON_VERSION_DEPRECATED
+
             result_at_boundary = check_python_version(today=custom_gapic_end)
             assert result_at_boundary == PythonVersionStatus.PYTHON_VERSION_EOL
 
@@ -221,7 +225,7 @@ def test_untracked_older_version_is_unsupported():
 
 def test_untracked_newer_version_is_supported():
     """Test that a new, untracked version is supported and does not log."""
-    mock_py_version = VersionInfoMock(major=4, minor=0)
+    mock_py_version = VersionInfoMock(major=40, minor=0)
 
     with patch(
         "google.api_core._python_version_support.sys.version_info", mock_py_version