Update code & integration tests to work on all Python versions

vchudnov-g · vchudnov-g · commit dce9bdf1578a · 2025-08-28T13:31:49.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
@@ -42,31 +42,43 @@ except AttributeError:
             "least Python 3.10, before then, and " +
             f"then update {_package_label}.")
 
-  import pkg_resources
   from packaging.version import parse as parse_version
 
-  def _get_version(dependency_name):
-    version_string = pkg_resources.get_distribution(dependency_name).version
-    return parse_version(version_string)
-
-  try:
-    _dependency_package = "google.protobuf"
-    _version_used = _get_version(_dependency_package)
-    _next_supported_version = "4.25.8"
-    if _version_used < parse_version(_next_supported_version):
-      logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-              f"{_dependency_package}, currently installed at version " +
-              f"{_version_used.__str__}. Future updates to " +
-              f"{_package_label} will require {_dependency_package} at " +
-              f"version {_next_supported_version} or higher. Please ensure " +
-              "that either (a) your Python environment doesn't pin the " +
-              f"version of {_dependency_package}, so that updates to " +
-              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}.")
-  except pkg_resources.DistributionNotFound:
-    pass
+  if sys.version_info < (3, 8):
+    import pkg_resources
+    def _get_version(dependency_name):
+      try:
+        version_string = pkg_resources.get_distribution(dependency_name).version
+        return parse_version(version_string)
+      except pkg_resources.DistributionNotFound:
+        return None
+  else:
+    from importlib import metadata
+  
+    def _get_version(dependency_name):
+      try:
+        version_string = metadata.version("requests")
+        parsed_version = parse_version(version_string)
+        return parsed_version.release
+      except metadata.PackageNotFoundError:
+        return None
+  
+  _dependency_package = "google.protobuf"
+  _next_supported_version = "4.25.8"
+  _next_supported_version_tuple = (4, 25, 8)
+  _version_used = _get_version(_dependency_package)
+  if _version_used and _version_used < _next_supported_version_tuple:
+    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+            f"{_dependency_package}, currently installed at version " +
+            f"{_version_used.__str__}. Future updates to " +
+            f"{_package_label} will require {_dependency_package} at " +
+            f"version {_next_supported_version} or higher. Please ensure " +
+            "that either (a) your Python environment doesn't pin the " +
+            f"version of {_dependency_package}, so that updates to " +
+            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}.")
   
 {#  Import subpackages. -#}
 {% for subpackage, _ in api.subpackages|dictsort %}
diff --git a/noxfile.py b/noxfile.py
@@ -60,6 +60,8 @@ def unit(session):
         "pyfakefs",
         "grpcio-status",
         "proto-plus",
+        "setuptools",  # TODO: Remove when not needed in __init__.py.j2
+        "packaging",  # TODO: Remove when not needed in __init__.py.j2
     )
     session.install("-e", ".")
     session.run(
@@ -481,6 +483,8 @@ def run_showcase_unit_tests(session, fail_under=100, rest_async_io_enabled=False
         "pytest-xdist",
         "asyncmock; python_version < '3.8'",
         "pytest-asyncio",
+        "setuptools",  # TODO: Remove when not needed in __init__.py.j2
+        "packaging",  # TODO: Remove when not needed in __init__.py.j2
     )
     # Run the tests.
     # NOTE: async rest is not supported against the minimum supported version of google-api-core.
@@ -595,6 +599,8 @@ def showcase_mypy(
         "types-protobuf",
         "types-requests",
         "types-dataclasses",
+        "setuptools",  # TODO: Remove when not needed in __init__.py.j2
+        "packaging",  # TODO: Remove when not needed in __init__.py.j2
     )
 
     with showcase_library(session, templates=templates, other_opts=other_opts) as lib:
@@ -725,6 +731,8 @@ def mypy(session):
         "types-PyYAML",
         "types-dataclasses",
         "click==8.1.3",
+        "setuptools",  # TODO: Remove when not needed in __init__.py.j2
+        "packaging",  # TODO: Remove when not needed in __init__.py.j2
     )
     session.install(".")
     session.run("mypy", "-p", "gapic")
diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py b/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py
@@ -46,31 +46,43 @@
             "least Python 3.10, before then, and " +
             f"then update {_package_label}.")
 
-  import pkg_resources
   from packaging.version import parse as parse_version
 
-  def _get_version(dependency_name):
-    version_string = pkg_resources.get_distribution(dependency_name).version
-    return parse_version(version_string)
+  if sys.version_info < (3, 8):
+    import pkg_resources
+    def _get_version(dependency_name):
+      try:
+        version_string = pkg_resources.get_distribution(dependency_name).version
+        return parse_version(version_string)
+      except pkg_resources.DistributionNotFound:
+        return None
+  else:
+    from importlib import metadata
 
-  try:
-    _dependency_package = "google.protobuf"
-    _version_used = _get_version(_dependency_package)
-    _next_supported_version = "4.25.8"
-    if _version_used < parse_version(_next_supported_version):
-      logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-              f"{_dependency_package}, currently installed at version " +
-              f"{_version_used.__str__}. Future updates to " +
-              f"{_package_label} will require {_dependency_package} at " +
-              f"version {_next_supported_version} or higher. Please ensure " +
-              "that either (a) your Python environment doesn't pin the " +
-              f"version of {_dependency_package}, so that updates to " +
-              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}.")
-  except pkg_resources.DistributionNotFound:
-    pass
+    def _get_version(dependency_name):
+      try:
+        version_string = metadata.version("requests")
+        parsed_version = parse_version(version_string)
+        return parsed_version.release
+      except metadata.PackageNotFoundError:
+        return None
+
+  _dependency_package = "google.protobuf"
+  _next_supported_version = "4.25.8"
+  _next_supported_version_tuple = (4, 25, 8)
+  _version_used = _get_version(_dependency_package)
+  if _version_used and _version_used < _next_supported_version_tuple:
+    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+            f"{_dependency_package}, currently installed at version " +
+            f"{_version_used.__str__}. Future updates to " +
+            f"{_package_label} will require {_dependency_package} at " +
+            f"version {_next_supported_version} or higher. Please ensure " +
+            "that either (a) your Python environment doesn't pin the " +
+            f"version of {_dependency_package}, so that updates to " +
+            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}.")
 
 
 from .services.asset_service import AssetServiceClient
diff --git a/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py b/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py
@@ -46,31 +46,43 @@
             "least Python 3.10, before then, and " +
             f"then update {_package_label}.")
 
-  import pkg_resources
   from packaging.version import parse as parse_version
 
-  def _get_version(dependency_name):
-    version_string = pkg_resources.get_distribution(dependency_name).version
-    return parse_version(version_string)
+  if sys.version_info < (3, 8):
+    import pkg_resources
+    def _get_version(dependency_name):
+      try:
+        version_string = pkg_resources.get_distribution(dependency_name).version
+        return parse_version(version_string)
+      except pkg_resources.DistributionNotFound:
+        return None
+  else:
+    from importlib import metadata
 
-  try:
-    _dependency_package = "google.protobuf"
-    _version_used = _get_version(_dependency_package)
-    _next_supported_version = "4.25.8"
-    if _version_used < parse_version(_next_supported_version):
-      logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-              f"{_dependency_package}, currently installed at version " +
-              f"{_version_used.__str__}. Future updates to " +
-              f"{_package_label} will require {_dependency_package} at " +
-              f"version {_next_supported_version} or higher. Please ensure " +
-              "that either (a) your Python environment doesn't pin the " +
-              f"version of {_dependency_package}, so that updates to " +
-              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}.")
-  except pkg_resources.DistributionNotFound:
-    pass
+    def _get_version(dependency_name):
+      try:
+        version_string = metadata.version("requests")
+        parsed_version = parse_version(version_string)
+        return parsed_version.release
+      except metadata.PackageNotFoundError:
+        return None
+
+  _dependency_package = "google.protobuf"
+  _next_supported_version = "4.25.8"
+  _next_supported_version_tuple = (4, 25, 8)
+  _version_used = _get_version(_dependency_package)
+  if _version_used and _version_used < _next_supported_version_tuple:
+    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+            f"{_dependency_package}, currently installed at version " +
+            f"{_version_used.__str__}. Future updates to " +
+            f"{_package_label} will require {_dependency_package} at " +
+            f"version {_next_supported_version} or higher. Please ensure " +
+            "that either (a) your Python environment doesn't pin the " +
+            f"version of {_dependency_package}, so that updates to " +
+            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}.")
 
 
 from .services.iam_credentials import IAMCredentialsClient
diff --git a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py
@@ -46,31 +46,43 @@
             "least Python 3.10, before then, and " +
             f"then update {_package_label}.")
 
-  import pkg_resources
   from packaging.version import parse as parse_version
 
-  def _get_version(dependency_name):
-    version_string = pkg_resources.get_distribution(dependency_name).version
-    return parse_version(version_string)
+  if sys.version_info < (3, 8):
+    import pkg_resources
+    def _get_version(dependency_name):
+      try:
+        version_string = pkg_resources.get_distribution(dependency_name).version
+        return parse_version(version_string)
+      except pkg_resources.DistributionNotFound:
+        return None
+  else:
+    from importlib import metadata
 
-  try:
-    _dependency_package = "google.protobuf"
-    _version_used = _get_version(_dependency_package)
-    _next_supported_version = "4.25.8"
-    if _version_used < parse_version(_next_supported_version):
-      logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-              f"{_dependency_package}, currently installed at version " +
-              f"{_version_used.__str__}. Future updates to " +
-              f"{_package_label} will require {_dependency_package} at " +
-              f"version {_next_supported_version} or higher. Please ensure " +
-              "that either (a) your Python environment doesn't pin the " +
-              f"version of {_dependency_package}, so that updates to " +
-              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}.")
-  except pkg_resources.DistributionNotFound:
-    pass
+    def _get_version(dependency_name):
+      try:
+        version_string = metadata.version("requests")
+        parsed_version = parse_version(version_string)
+        return parsed_version.release
+      except metadata.PackageNotFoundError:
+        return None
+
+  _dependency_package = "google.protobuf"
+  _next_supported_version = "4.25.8"
+  _next_supported_version_tuple = (4, 25, 8)
+  _version_used = _get_version(_dependency_package)
+  if _version_used and _version_used < _next_supported_version_tuple:
+    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+            f"{_dependency_package}, currently installed at version " +
+            f"{_version_used.__str__}. Future updates to " +
+            f"{_package_label} will require {_dependency_package} at " +
+            f"version {_next_supported_version} or higher. Please ensure " +
+            "that either (a) your Python environment doesn't pin the " +
+            f"version of {_dependency_package}, so that updates to " +
+            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}.")
 
 
 from .services.eventarc import EventarcClient
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py b/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py
@@ -46,31 +46,43 @@
             "least Python 3.10, before then, and " +
             f"then update {_package_label}.")
 
-  import pkg_resources
   from packaging.version import parse as parse_version
 
-  def _get_version(dependency_name):
-    version_string = pkg_resources.get_distribution(dependency_name).version
-    return parse_version(version_string)
+  if sys.version_info < (3, 8):
+    import pkg_resources
+    def _get_version(dependency_name):
+      try:
+        version_string = pkg_resources.get_distribution(dependency_name).version
+        return parse_version(version_string)
+      except pkg_resources.DistributionNotFound:
+        return None
+  else:
+    from importlib import metadata
 
-  try:
-    _dependency_package = "google.protobuf"
-    _version_used = _get_version(_dependency_package)
-    _next_supported_version = "4.25.8"
-    if _version_used < parse_version(_next_supported_version):
-      logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-              f"{_dependency_package}, currently installed at version " +
-              f"{_version_used.__str__}. Future updates to " +
-              f"{_package_label} will require {_dependency_package} at " +
-              f"version {_next_supported_version} or higher. Please ensure " +
-              "that either (a) your Python environment doesn't pin the " +
-              f"version of {_dependency_package}, so that updates to " +
-              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}.")
-  except pkg_resources.DistributionNotFound:
-    pass
+    def _get_version(dependency_name):
+      try:
+        version_string = metadata.version("requests")
+        parsed_version = parse_version(version_string)
+        return parsed_version.release
+      except metadata.PackageNotFoundError:
+        return None
+
+  _dependency_package = "google.protobuf"
+  _next_supported_version = "4.25.8"
+  _next_supported_version_tuple = (4, 25, 8)
+  _version_used = _get_version(_dependency_package)
+  if _version_used and _version_used < _next_supported_version_tuple:
+    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+            f"{_dependency_package}, currently installed at version " +
+            f"{_version_used.__str__}. Future updates to " +
+            f"{_package_label} will require {_dependency_package} at " +
+            f"version {_next_supported_version} or higher. Please ensure " +
+            "that either (a) your Python environment doesn't pin the " +
+            f"version of {_dependency_package}, so that updates to " +
+            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}.")
 
 
 from .services.config_service_v2 import ConfigServiceV2Client
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
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py b/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py
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
