Merge branch 'main' into feat/centralize-mypy-handwritten

Author: chalmerlowe

.github/workflows/gapic-generator-tests.yml

@@ -5,13 +5,8 @@ name: Gapic Generator Specialized Tests
 
 on:
   pull_request:
-    paths:
-      - 'packages/gapic-generator/**'
-      - '.github/workflows/gapic-generator-tests.yml'
   push:
     branches: [main]
-    paths:
-      - 'packages/gapic-generator/**'
 
 concurrency:
   group: gapic-gen-${{ github.head_ref || github.run_id }}
@@ -30,11 +25,8 @@ env:
   PYO3_USE_ABI3_FORWARD_COMPATIBILITY: "1"
 
 jobs:
+  # Check if the gapic-generator was changed. If so, execute specialized tests
   check_changes:
-    # We use a job-level 'if' with dorny/paths-filter because GitHub's top-level 
-    # 'on: pull_request: paths' can be bypassed during repository-wide migrations 
-    # or structural changes. This ensures these specialized (and heavy) matrix 
-    # jobs stay silent on PRs that do not touch the generator.
     runs-on: ubuntu-latest
     outputs:
       run_generator: ${{ steps.filter.outputs.generator }}
@@ -59,7 +51,7 @@ jobs:
       all_python: ${{ env.ALL_PYTHON }}
       latest_stable_python: ${{ env.LATEST_STABLE_PYTHON }}
       prerelease_python: ${{ env.PRERELEASE_PYTHON }}
-      trimmed_python: $${{ env.TRIMMED_PYTHON }}
+      trimmed_python: ${{ env.TRIMMED_PYTHON }}
     steps:
       - run: echo "Initializing config for gapic-generator"
 
@@ -232,7 +224,6 @@ jobs:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           persist-credentials: false
-      
       - name: Cache Bazel files
         id: cache-bazel
         uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
@@ -247,3 +238,27 @@ jobs:
           # WORKSPACE file is located there.
           cd packages/gapic-generator
           bazelisk test //tests/integration/... --test_output=errors
+
+  # Final job to simplify branch protection rules.
+  # This job will be reported as 'Success' if all its dependencies either 
+  # pass or are skipped due to path filtering.
+  status:
+    needs: [check_changes, python_config, showcase-unit, showcase-mypy, goldens, goldens-prerelease, fragment-snippet, integration]
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check all jobs for failure
+        env:
+          NEEDS_JSON: ${{ toJson(needs) }}
+        run: |
+          # 1. Print a human-readable list of each dependency job and its final status.
+          echo "Job Results:"
+          echo "$NEEDS_JSON" | jq -r 'to_entries[] | "  - \(.key): \(.value.result)"'
+
+          # 2. Evaluate if any job actually failed or was cancelled.
+          if echo "$NEEDS_JSON" | jq -e 'to_entries[].value | select(.result == "failure" or .result == "cancelled")' >/dev/null; then
+            echo "Error: One or more required jobs failed or were cancelled."
+            exit 1
+          fi
+          echo "All checks passed or were successfully skipped."
+

.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,53 +357,7 @@ 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.
+    # 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",
     ]

.release-please-bulk-manifest.json

@@ -12,12 +12,12 @@
   "packages/google-analytics-data": "0.23.0",
   "packages/google-api-core": "2.31.0",
   "packages/google-apps-card": "0.7.0",
-  "packages/google-apps-chat": "0.10.1",
+  "packages/google-apps-chat": "0.10.2",
   "packages/google-apps-events-subscriptions": "0.6.0",
   "packages/google-apps-meet": "0.5.0",
   "packages/google-apps-script-type": "0.8.0",
   "packages/google-area120-tables": "0.15.0",
-  "packages/google-auth": "2.55.2",
+  "packages/google-auth": "2.56.0",
   "packages/google-auth-httplib2": "0.4.0",
   "packages/google-auth-oauthlib": "1.4.0",
   "packages/google-backstory": "0.1.0",
@@ -31,7 +31,7 @@
   "packages/google-cloud-api-gateway": "1.16.0",
   "packages/google-cloud-api-keys": "0.9.0",
   "packages/google-cloud-apigee-connect": "1.16.0",
-  "packages/google-cloud-apigee-registry": "0.10.0",
+  "packages/google-cloud-apigee-registry": "0.10.1",
   "packages/google-cloud-apihub": "0.7.0",
   "packages/google-cloud-apiregistry": "0.3.0",
   "packages/google-cloud-appengine-admin": "1.18.0",
@@ -68,7 +68,7 @@
   "packages/google-cloud-bigtable": "2.40.0",
   "packages/google-cloud-billing": "1.20.0",
   "packages/google-cloud-billing-budgets": "1.21.0",
-  "packages/google-cloud-binary-authorization": "1.18.0",
+  "packages/google-cloud-binary-authorization": "1.19.0",
   "packages/google-cloud-build": "3.38.0",
   "packages/google-cloud-capacityplanner": "0.5.0",
   "packages/google-cloud-certificate-manager": "1.14.0",
@@ -113,7 +113,7 @@
   "packages/google-cloud-dms": "1.16.0",
   "packages/google-cloud-dns": "0.37.0",
   "packages/google-cloud-documentai": "3.15.0",
-  "packages/google-cloud-documentai-toolbox": "0.17.0",
+  "packages/google-cloud-documentai-toolbox": "0.17.1",
   "packages/google-cloud-domains": "1.14.0",
   "packages/google-cloud-edgecontainer": "0.8.1",
   "packages/google-cloud-edgenetwork": "0.5.1",
@@ -154,7 +154,7 @@
   "packages/google-cloud-managedkafka-schemaregistry": "0.4.1",
   "packages/google-cloud-media-translation": "0.14.1",
   "packages/google-cloud-memcache": "1.16.0",
-  "packages/google-cloud-memorystore": "0.5.1",
+  "packages/google-cloud-memorystore": "0.5.2",
   "packages/google-cloud-migrationcenter": "0.4.1",
   "packages/google-cloud-modelarmor": "0.7.1",
   "packages/google-cloud-monitoring": "2.31.0",
@@ -210,7 +210,7 @@
   "packages/google-cloud-source-context": "1.11.0",
   "packages/google-cloud-spanner": "3.69.0",
   "packages/google-cloud-speech": "2.40.0",
-  "packages/google-cloud-storage": "3.12.1",
+  "packages/google-cloud-storage": "3.13.0",
   "packages/google-cloud-storage-control": "1.12.0",
   "packages/google-cloud-storage-transfer": "1.21.0",
   "packages/google-cloud-storagebatchoperations": "0.8.0",
@@ -240,7 +240,7 @@
   "packages/google-cloud-workloadmanager": "0.2.1",
   "packages/google-cloud-workstations": "0.8.1",
   "packages/google-developer-knowledge": "0.1.0",
-  "packages/google-devicesandservices-health": "0.1.0",
+  "packages/google-devicesandservices-health": "0.1.1",
   "packages/google-geo-type": "0.7.0",
   "packages/google-maps-addressvalidation": "0.7.0",
   "packages/google-maps-areainsights": "0.5.0",

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=$?