From 4b03c9faacd004d32d30742f215285a026db4ca7 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 6 Nov 2025 16:33:17 +0000 Subject: [PATCH 1/3] fix: remove call to importlib.metadata.packages_distributions() for py38/py39 --- google/api_core/_python_version_support.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/google/api_core/_python_version_support.py b/google/api_core/_python_version_support.py index 2c56364b..e50f2a66 100644 --- a/google/api_core/_python_version_support.py +++ b/google/api_core/_python_version_support.py @@ -151,9 +151,10 @@ def _flatten_message(text: str) -> str: return " ".join(textwrap.dedent(text).strip().split()) -# 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): +# TODO(https://github.com/googleapis/python-api-core/issues/835): +# Remove once we no longer support Python 3.9. +# `metadata.packages_distributions()` is only supported in Python 3.10 and newer +if sys.version_info < (3, 10): def _get_pypi_package_name(module_name): # pragma: NO COVER """Determine the PyPI package name for a given module name.""" From f9c5362de955e6e170c9ca2a0fcc0ed22a6cf420 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 6 Nov 2025 16:41:07 +0000 Subject: [PATCH 2/3] cover --- google/api_core/_python_version_support.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/api_core/_python_version_support.py b/google/api_core/_python_version_support.py index e50f2a66..7d7b26d7 100644 --- a/google/api_core/_python_version_support.py +++ b/google/api_core/_python_version_support.py @@ -173,7 +173,7 @@ def _get_pypi_package_name(module_name): if module_name in module_to_distributions: # pragma: NO COVER # The value is a list of distribution names, take the first one return module_to_distributions[module_name][0] - except Exception as e: + except Exception as e: # pragma: NO COVER _LOGGER.info( "An error occurred while determining PyPI package name for %s: %s", module_name, From 86a4113b0d8588d872061cd1fe84ba685b3768f3 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 6 Nov 2025 16:44:01 +0000 Subject: [PATCH 3/3] update comment --- google/api_core/_python_version_support.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google/api_core/_python_version_support.py b/google/api_core/_python_version_support.py index 7d7b26d7..d0c0dfe1 100644 --- a/google/api_core/_python_version_support.py +++ b/google/api_core/_python_version_support.py @@ -153,7 +153,8 @@ def _flatten_message(text: str) -> str: # TODO(https://github.com/googleapis/python-api-core/issues/835): # Remove once we no longer support Python 3.9. -# `metadata.packages_distributions()` is only supported in Python 3.10 and newer +# `importlib.metadata.packages_distributions()` is only supported in Python 3.10 and newer +# https://docs.python.org/3/library/importlib.metadata.html#importlib.metadata.packages_distributions if sys.version_info < (3, 10): def _get_pypi_package_name(module_name): # pragma: NO COVER