Merge branch 'main' into feat/gapic-centralization-api-core

Author: hebaalazzeh

.github/workflows/import-profiler.yml

@@ -0,0 +1,36 @@
+name: import-profiler
+
+on:
+  pull_request:
+    branches:
+      - main
+      - preview
+  # Trigger workflow on GitHub merge queue events
+  merge_group:
+    types: [checks_requested]
+
+permissions:
+  contents: read
+
+jobs:
+  import-profile:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 2
+    - name: Setup Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: "3.15"
+        allow-prereleases: true
+    - 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"
+      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",
     ]

ci/run_single_test.sh

@@ -105,6 +105,62 @@ case ${TEST_TYPE} in
             ;;
         esac
         ;;
+    import_profile)
+        if [ -f setup.py ] || [ -f pyproject.toml ]; then
+            echo "Creating temporary virtualenv for import profile..."
+            python3 -m venv .venv-profiler
+            source .venv-profiler/bin/activate
+            python -m pip install --upgrade pip setuptools
+            
+            PACKAGE_NAME=$(basename $(pwd))
+            PROFILER_TEMP_DIR=$(mktemp -d)
+            cp ../../scripts/import_profiler/profiler.py "${PROFILER_TEMP_DIR}/profiler.py"
+            PROFILER_SCRIPT="${PROFILER_TEMP_DIR}/profiler.py"
+            BASELINE_CSV="${PROFILER_TEMP_DIR}/baseline_${PACKAGE_NAME}.csv"
+            
+            if [ -n "${TARGET_BRANCH}" ]; then
+                # Try upstream first (for forks), then origin
+                BASELINE_COMMIT=$(git merge-base HEAD "upstream/${TARGET_BRANCH}" 2>/dev/null || \
+                                 git merge-base HEAD "origin/${TARGET_BRANCH}" 2>/dev/null || \
+                                 git merge-base HEAD "${TARGET_BRANCH}" 2>/dev/null || true)
+                if [ -n "${BASELINE_COMMIT}" ]; then
+                    echo "Checking out baseline commit ${BASELINE_COMMIT} in a temporary worktree..."
+                    REPO_PREFIX=$(git rev-parse --show-prefix)
+                    WORKTREE_DIR=$(mktemp -d)
+                    rmdir "${WORKTREE_DIR}"
+                    if git worktree add "${WORKTREE_DIR}" "${BASELINE_COMMIT}" 2>/dev/null; then
+                        (
+                            cd "${WORKTREE_DIR}/${REPO_PREFIX}"
+                            if [ -f setup.py ] || [ -f pyproject.toml ]; then
+                                pip install -e .
+                                python "${PROFILER_SCRIPT}" --package "${PACKAGE_NAME}" --iterations 11 --csv "${BASELINE_CSV}"
+                            fi
+                        )
+                        git worktree remove -f "${WORKTREE_DIR}"
+                    else
+                        echo "Failed to create git worktree for baseline. Skipping baseline generation."
+                    fi
+                else
+                    echo "Could not find baseline commit for ${TARGET_BRANCH:-main}. Skipping baseline generation."
+                fi
+            fi
+            
+            pip install -e .
+            
+            if [ -f "${BASELINE_CSV}" ]; then
+                python ${PROFILER_SCRIPT} --package ${PACKAGE_NAME} --iterations 11 --fail-threshold 5000 --diff-baseline "${BASELINE_CSV}" --diff-threshold 100
+            else
+                python ${PROFILER_SCRIPT} --package ${PACKAGE_NAME} --iterations 11 --fail-threshold 5000
+            fi
+            retval=$?
+            deactivate
+            rm -rf .venv-profiler
+            rm -rf "${PROFILER_TEMP_DIR}"
+        else
+            echo "Skipping import_profile as this does not appear to be a Python package (no setup.py or pyproject.toml)."
+            retval=0
+        fi
+        ;;
     *)
         nox -s ${TEST_TYPE}
         retval=$?

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:
@@ -635,6 +635,7 @@ libraries:
     apis:
       - path: google/bigtable/v2
       - path: google/bigtable/admin/v2
+    skip_generate: true
     python:
       library_type: GAPIC_COMBO
       opt_args_by_api:

packages/bigframes/testing/constraints-3.11.txt

@@ -172,7 +172,7 @@ google-pasta==0.2.0
 google-resumable-media==2.7.2
 googleapis-common-protos==1.70.0
 googledrivedownloader==1.1.0
-gradio==6.15.0
+gradio==6.15.1
 gradio_client==1.11.0
 graphviz==0.21
 greenlet==3.2.3

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)