regen

Author: JoeWang1127

.librarian/generator-input/client-post-processing/bigtable-integration.yaml

@@ -252,14 +252,21 @@ replacements:
   - paths: [
       packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py
     ]
-    before: '"UpdateTableRequest",\n\)\n\Z'
-    after: |
+    before: |-
+      "UpdateTableRequest",
+      \)
+
+      api_core\.check_python_version
+    after: |-
       "UpdateTableRequest",
       )
 
       from .overlay import *  # noqa: F403
 
       __all__ += overlay.__all__  # noqa: F405
+
+
+      api_core.check_python_version
     count: 1
   - paths: [
       packages/google-cloud-bigtable/google/cloud/bigtable_admin/__init__.py

.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml

@@ -44,15 +44,14 @@ replacements:
       packages/google-cloud-vision/google/cloud/vision_v1p3beta1/__init__.py,
       packages/google-cloud-vision/google/cloud/vision_v1p4beta1/__init__.py,
     ]    
-    before: |
-      \)\n
-      __all__ = \(
+    before: '(?<!Feature = Feature\n\n\n)__all__ = \('
     after: |
-      )\n\n
       @add_single_feature_methods
       class ImageAnnotatorClient(VisionHelpers, IacImageAnnotatorClient):
           __doc__ = IacImageAnnotatorClient.__doc__
-          Feature = Feature\n\n
+          Feature = Feature
+
+
       __all__ = (
     count: 5
   - paths: [

.librarian/generator-input/client-post-processing/spanner-integration.yaml

@@ -95,42 +95,6 @@ replacements:
     after: |
       \g<1>            metrics_interceptor=mock.ANY,
     count: 1
-    # Temporary patch until gapic-generator 1.38 or newer is released.
-    # From https://github.com/googleapis/google-cloud-python/pull/17838
-  - paths:
-      - packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
-      - packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
-      - packages/google-cloud-spanner/tests/unit/gapic/spanner_v1/test_spanner.py
-    before: |
-      for config_data, expected_cert_source in test_cases:
-      \            env = os.environ.copy\(\)
-      \            env.pop\("GOOGLE_API_USE_CLIENT_CERTIFICATE", None\)
-      \            with mock.patch.dict\(os.environ, env, clear=True\):
-    after: |
-      for config_data, expected_cert_source in test_cases:
-                env = os.environ.copy()
-                env.pop("GOOGLE_API_USE_CLIENT_CERTIFICATE", None)
-                env.pop("CLOUDSDK_CONTEXT_AWARE_USE_CLIENT_CERTIFICATE", None)
-                with mock.patch.dict(os.environ, env, clear=True):
-    count: 3
-    # Temporary patch until gapic-generator 1.38 or newer is released.
-    # From https://github.com/googleapis/google-cloud-python/pull/17838
-  - paths:
-      - packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
-      - packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
-      - packages/google-cloud-spanner/tests/unit/gapic/spanner_v1/test_spanner.py
-    before: |
-      for config_data, expected_cert_source in test_cases:
-      \            env = os.environ.copy\(\)
-      \            env.pop\("GOOGLE_API_USE_CLIENT_CERTIFICATE", ""\)
-      \            with mock.patch.dict\(os.environ, env, clear=True\):
-    after: |
-      for config_data, expected_cert_source in test_cases:
-                env = os.environ.copy()
-                env.pop("GOOGLE_API_USE_CLIENT_CERTIFICATE", "")
-                env.pop("CLOUDSDK_CONTEXT_AWARE_USE_CLIENT_CERTIFICATE", "")
-                with mock.patch.dict(os.environ, env, clear=True):
-    count: 3
   - paths: 
       - packages/google-cloud-spanner/tests/unit/gapic/spanner_v1/test_spanner.py
     # Group 1: Captures ONLY the spaces/tabs before the text
@@ -285,7 +249,7 @@ replacements:
         summary_overview.md
     count: 1
   - paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/__init__.py]
-    before: '(?s)import sys\n\nimport google\.api_core as api_core.*'
+    before: '(?s)import google\.api_core as api_core.*'
     after: |
       from __future__ import absolute_import
 

packages/google-ads-admanager/google/ads/admanager_v1/__init__.py

@@ -13,16 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import sys
-
 import google.api_core as api_core
 
 from google.ads.admanager_v1 import gapic_version as package_version
 
 __version__ = package_version.__version__
 
-from importlib import metadata
-
 # PEP 0810: Explicit Lazy Imports
 # Python 3.15+ natively intercepts and defers these imports.
 # Developers can disable this behavior and force eager imports.
@@ -1317,89 +1313,6 @@
 )
 from .types.web_property import WebProperty
 
-if hasattr(api_core, "check_python_version") and hasattr(
-    api_core, "check_dependency_versions"
-):  # pragma: NO COVER
-    api_core.check_python_version("google.ads.admanager_v1")  # type: ignore
-    api_core.check_dependency_versions("google.ads.admanager_v1")  # type: ignore
-else:  # pragma: NO COVER
-    # An older version of api_core is installed which does not define the
-    # functions above. We do equivalent checks manually.
-    try:
-        import warnings
-
-        _py_version_str = sys.version.split()[0]
-        _package_label = "google.ads.admanager_v1"
-        if sys.version_info < (3, 10):
-            warnings.warn(
-                "You are using a non-supported Python version "
-                + f"({_py_version_str}).  Google will not post any further "
-                + f"updates to {_package_label} supporting this Python version. "
-                + "Please upgrade to the latest Python version, or at "
-                + f"least to Python 3.10, and then update {_package_label}.",
-                FutureWarning,
-            )
-
-        def parse_version_to_tuple(version_string: str):
-            """Safely converts a semantic version string to a comparable tuple of integers.
-            Example: "6.33.5" -> (6, 33, 5)
-            Ignores non-numeric parts and handles common version formats.
-            Args:
-                version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
-            Returns:
-                Tuple of integers for the parsed version string.
-            """
-            parts = []
-            for part in version_string.split("."):
-                try:
-                    parts.append(int(part))
-                except ValueError:
-                    # If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
-                    # This is a simplification compared to 'packaging.parse_version', but sufficient
-                    # for comparing strictly numeric semantic versions.
-                    break
-            return tuple(parts)
-
-        def _get_version(dependency_name):
-            try:
-                version_string: str = metadata.version(dependency_name)
-                parsed_version = parse_version_to_tuple(version_string)
-                return (parsed_version, version_string)
-            except Exception:
-                # Catch exceptions from metadata.version() (e.g., PackageNotFoundError)
-                # or errors during parse_version_to_tuple
-                return (None, "--")
-
-        _dependency_package = "google.protobuf"
-        _next_supported_version = "6.33.5"
-        _next_supported_version_tuple = (6, 33, 5)
-        _recommendation = " (we recommend 7.x)"
-        (_version_used, _version_used_string) = _get_version(_dependency_package)
-        if _version_used and _version_used < _next_supported_version_tuple:
-            warnings.warn(
-                f"Package {_package_label} depends on "
-                + f"{_dependency_package}, currently installed at version "
-                + f"{_version_used_string}. Future updates to "
-                + f"{_package_label} will require {_dependency_package} at "
-                + f"version {_next_supported_version} or higher{_recommendation}."
-                + " 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}.",
-                FutureWarning,
-            )
-    except Exception:
-        warnings.warn(
-            "Could not determine the version of Python "
-            + "currently being used. To continue receiving "
-            + "updates for {_package_label}, ensure you are "
-            + "using a supported version of Python; see "
-            + "https://devguide.python.org/versions/"
-        )
-
 __all__ = (
     "ActivateCustomTargetingValueRequest",
     "ActivateDaiEncodingProfileRequest",
@@ -2244,3 +2157,6 @@ def _get_version(dependency_name):
     "WebProperty",
     "WebviewClaimingStatusEnum",
 )
+
+api_core.check_python_version("google.ads.admanager_v1")
+api_core.check_dependency_versions("google.ads.admanager_v1")