Merge branch 'main' into shuowei-fix-sqlglot-array-syntax

Author: shuoweil

.github/workflows/import-profiler.yml

@@ -26,14 +26,13 @@ jobs:
       with:
         python-version: "3.15"
         allow-prereleases: true
-    - name: Upgrade pip, setuptools, and wheel
-      run: |
-        python -m pip install --upgrade setuptools pip wheel
     - name: Run import profiler
       env:
         BUILD_TYPE: presubmit
         TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref }}
         TEST_TYPE: import_profile
         PY_VERSION: "3.15"
+        # Workaround: Allows libcst to compile on Python 3.15+ while PyO3 catches up
+        PYO3_USE_ABI3_FORWARD_COMPATIBILITY: "1"
       run: |
         ci/run_conditional_tests.sh

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

@@ -357,52 +357,6 @@ replacements:
 
       Quick Start
     count: 1
-  - paths: [
-      packages/google-cloud-bigtable/mypy.ini
-    ]
-    before: |
-      \[mypy\]
-      [\s\S]*?incremental = True
-    after: |
-      [mypy]
-      python_version = 3.13
-      namespace_packages = True
-      check_untyped_defs = True
-      warn_unreachable = True
-      disallow_any_generics = True
-      exclude = tests/unit/gapic/
-
-      [mypy-grpc.*]
-      ignore_missing_imports = True
-
-      [mypy-google.auth.*]
-      ignore_missing_imports = True
-
-      [mypy-google.iam.*]
-      ignore_missing_imports = True
-
-      [mypy-google.longrunning.*]
-      ignore_missing_imports = True
-
-      [mypy-google.oauth2.*]
-      ignore_missing_imports = True
-
-      [mypy-google.rpc.*]
-      ignore_missing_imports = True
-
-      [mypy-proto.*]
-      ignore_missing_imports = True
-
-      [mypy-pytest]
-      ignore_missing_imports = True
-
-      [mypy-google.cloud.*]
-      ignore_errors = True
-
-      # only verify data client
-      [mypy-google.cloud.bigtable.data.*]
-      ignore_errors = False
-    count: 1
     # Note: noxfile.py is heavily customized so we clobber the whole file. 
   - paths: [
       packages/google-cloud-bigtable/noxfile.py

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

@@ -39,42 +39,6 @@ replacements:
           "google-cloud-core >= 2.0.0, <3.0.0",
           "grpcio >= 1.59.0, < 2.0.0",
     count: 1
-  - paths: [
-      "packages/google-cloud-datastore/mypy.ini",
-    ]
-    before: |-
-      # Performance: reuse results from previous runs to speed up 'nox'
-      incremental = True
-    after: |-
-      # Performance: reuse results from previous runs to speed up "nox"
-      incremental = True
-
-      [mypy-google.cloud.datastore._app_engine_key_pb2]
-      ignore_errors = True
-
-      # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410):
-      # Remove once this generator bug is fixed
-      [mypy-google.cloud.datastore_v1.services.datastore.async_client]
-      ignore_errors = True
-
-      # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410):
-      # Remove once this generator bug is fixed
-      [mypy-google.cloud.datastore_v1.services.datastore.client]
-      ignore_errors = True
-    count: 1
-  - paths: [
-      "packages/google-cloud-datastore/mypy.ini",
-    ]
-    before: |
-      ignore_missing_imports = False
-
-      # TODO\(https://github.com/googleapis/gapic-generator-python/issues/2563\):
-      # Dependencies that historically lacks py.typed markers
-      \[mypy-google\.iam\.\*\]
-      ignore_missing_imports = True
-    after: |
-      ignore_missing_imports = True
-    count: 1
   - paths: [
       "packages/google-cloud-datastore/docs/index.rst",
     ]

librarian.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 language: python
-version: v0.22.0
+version: v0.26.0
 repo: googleapis/google-cloud-python
 sources:
   googleapis:

packages/google-ads-admanager/mypy.ini

@@ -36,16 +36,24 @@
     "3.12",
     "3.13",
     "3.14",
+    "3.15",
 ]
 
 DEFAULT_PYTHON_VERSION = "3.14"
 
-# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):
-# Switch this to Python 3.15 alpha1
-# https://peps.python.org/pep-0790/
-PREVIEW_PYTHON_VERSION = "3.14"
+PREVIEW_PYTHON_VERSION = "3.15"
 
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
+# Path to the centralized mypy configuration file at the repository root.
+# Search upwards to support running nox from both monorepo packages and integration test goldens.
+MYPY_CONFIG_FILE = next(
+    (
+        str(p / "mypy.ini")
+        for p in CURRENT_DIRECTORY.parents
+        if (p / "mypy.ini").exists()
+    ),
+    str(CURRENT_DIRECTORY.parent.parent / "mypy.ini"),
+)
 
 if (CURRENT_DIRECTORY / "testing").exists():
     LOWER_BOUND_CONSTRAINTS_FILE = (
@@ -107,6 +115,7 @@ def mypy(session):
     session.install(".")
     session.run(
         "mypy",
+        f"--config-file={MYPY_CONFIG_FILE}",
         "-p",
         "google",
         "--check-untyped-defs",
@@ -566,7 +575,7 @@ def prerelease_deps(session, protobuf_implementation):
     )
 
 
-@nox.session(python=DEFAULT_PYTHON_VERSION)
+@nox.session(python=PREVIEW_PYTHON_VERSION)
 @nox.parametrize(
     "protobuf_implementation",
     ["python", "upb"],

packages/google-ads-admanager/noxfile.py

@@ -0,0 +1,12 @@
+# We use the constraints file for the latest Python version
+# (currently this file) to check that the latest
+# major versions of dependencies are supported in setup.py.
+# List all library dependencies and extras in this file.
+# Require the latest major version be installed for each dependency.
+# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# Then this file should have google-cloud-foo>=1
+google-api-core>=2
+google-auth>=2
+grpcio>=1
+proto-plus>=1
+protobuf>=7

packages/google-ads-admanager/testing/constraints-3.15.txt

@@ -1607,6 +1607,9 @@ def test_list_ad_breaks_rest_pager(transport: str = "rest"):
 
         pager = client.list_ad_breaks(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, ad_break_messages.AdBreak) for i in results)

packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py

@@ -1488,6 +1488,9 @@ def test_search_ad_review_center_ads_rest_pager(transport: str = "rest"):
 
         pager = client.search_ad_review_center_ads(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(

packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py

@@ -1595,6 +1595,9 @@ def test_list_ad_units_rest_pager(transport: str = "rest"):
 
         pager = client.list_ad_units(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, ad_unit_messages.AdUnit) for i in results)
@@ -1859,6 +1862,9 @@ def test_list_ad_unit_sizes_rest_pager(transport: str = "rest"):
 
         pager = client.list_ad_unit_sizes(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, ad_unit_messages.AdUnitSize) for i in results)