Merge branch 'main' into feat/version-scanner-pr1

Author: chalmerlowe

.github/workflows/django-spanner-django5.2_tests.yml

@@ -21,7 +21,7 @@ jobs:
     outputs:
       run_django_spanner: ${{ steps.filter.outputs.django_spanner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -68,9 +68,9 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Run Django tests

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

@@ -18,7 +18,13 @@ env:
   SHOWCASE_VERSION: 0.35.0
   PROTOC_VERSION: 3.20.2
   LATEST_STABLE_PYTHON: 3.14
-  ALL_PYTHON: "['3.10', '3.11', '3.12', '3.13', '3.14']"
+  PRERELEASE_PYTHON: 3.15
+  ALL_PYTHON: "['3.10', '3.11', '3.12', '3.13', '3.14', '3.15']"
+  TRIMMED_PYTHON: "['3.10', '3.14', '3.15']"
+  # Workaround: Allows libcst to compile on Python 3.15+ while PyO3 catches up
+  # Can be removed once libcst releases a version with native Python 3.15 wheels
+  # Follow https://github.com/Instagram/LibCST/issues/1445 for updates.
+  PYO3_USE_ABI3_FORWARD_COMPATIBILITY: "1"
 
 jobs:
   check_changes:
@@ -47,6 +53,8 @@ jobs:
     outputs:
       all_python: ${{ env.ALL_PYTHON }}
       latest_stable_python: ${{ env.LATEST_STABLE_PYTHON }}
+      prerelease_python: ${{ env.PRERELEASE_PYTHON }}
+      trimmed_python: $${{ env.TRIMMED_PYTHON }}
     steps:
       - run: echo "Initializing config for gapic-generator"
 
@@ -65,6 +73,12 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: "${{ matrix.python }}"
+          allow-prereleases: true
+          # Caches compiled wheels locally to prevent building heavy libraries 
+          # such as grpcio, which we build from scratch on every run for Python 3.15+.
+          # Follow https://github.com/grpc/grpc/issues/41010 for updates.
+          cache: 'pip'
+          cache-dependency-path: '**/requirements*.txt'
       - name: Install System Deps & Protoc
         run: |
           sudo apt-get update && sudo apt-get install -y curl pandoc unzip
@@ -132,10 +146,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - name: Set up Python
+      - name: Set up Python ${{ needs.python_config.outputs.prerelease_python }}
         uses: actions/setup-python@v6
         with:
-          python-version: ${{ needs.python_config.outputs.latest_stable_python }}
+          python-version: ${{ needs.python_config.outputs.prerelease_python }}
+          allow-prereleases: true
+          # Caches compiled wheels locally to prevent building heavy libraries 
+          # such as grpcio, which we build from scratch on every run for Python 3.15+.
+          # Follow https://github.com/grpc/grpc/issues/41010 for updates.
+          cache: 'pip'
+          cache-dependency-path: '**/requirements*.txt'
       - name: Install System Deps
         run: sudo apt-get update && sudo apt-get install -y pandoc
       - name: Run Goldens (Prerelease)
@@ -150,15 +170,20 @@ jobs:
     needs: python_config
     strategy:
       matrix:
-        python: ["3.10", "3.14"]
+        python: ${{ fromJSON(needs.python_config.outputs.trimmed_python) }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
-      # This fixes the Pandoc error
+          allow-prereleases: true
+          # Caches compiled wheels locally to prevent building heavy libraries 
+          # such as grpcio, which we build from scratch on every run for Python 3.15+.
+          # Follow https://github.com/grpc/grpc/issues/41010 for updates.
+          cache: 'pip'
+          cache-dependency-path: '**/requirements*.txt'
       - name: Install System Deps & Protoc
         run: |
           sudo apt-get update && sudo apt-get install -y curl pandoc unzip

.github/workflows/unittest.yml

@@ -20,14 +20,14 @@ jobs:
         python: ['3.9', '3.10', "3.11", "3.12", "3.13", "3.14"]
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       # Use a fetch-depth of 2 to avoid error `fatal: origin/main...HEAD: no merge base`
       # See https://github.com/googleapis/google-cloud-python/issues/12013
       # and https://github.com/actions/checkout#checkout-head.
       with:
         fetch-depth: 2
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python }}
     - name: Install nox
@@ -79,7 +79,7 @@ jobs:
         python -m pip install coverage
     - name: Download coverage results
       if: ${{ steps.packages.outputs.num_files_changed > 0 }}
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         path: .coverage-results/
     - name: Report coverage results

.kokoro/system.sh

@@ -60,8 +60,15 @@ run_package_test() {
 
       PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/google-auth-project-id.json")
       GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/google-auth-service-account.json"
-      NOX_FILE="system_tests/noxfile.py"
-      NOX_SESSION=""
+      # Note: system.sh is also reused for monorepo-wide continuous unit test jobs
+      # like `core_deps_from_source` and `prerelease_deps`. For google-auth, we only
+      # want to override NOX_FILE to system_tests/noxfile.py when running actual system tests.
+      if [[ -z "${NOX_SESSION}" || "${NOX_SESSION}" == "system-"* ]]; then
+        NOX_FILE="system_tests/noxfile.py"
+        NOX_SESSION=""
+      else
+        NOX_FILE="noxfile.py"
+      fi
       ;;
     *)
       PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")

.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml

@@ -28,6 +28,15 @@ replacements:
           "pyarrow",
       ]
     count: 1
+  - paths: [
+      packages/google-cloud-bigquery-storage/noxfile.py,
+    ]
+    before: |
+      \    # Install all dependencies\n    session.install\("-e", "\."\)
+    after: |2
+          # Install all dependencies
+          session.install("-e", f".[{','.join(UNIT_TEST_EXTRAS)}]")
+    count: 2
   - paths: [
       packages/google-cloud-bigquery-storage/noxfile.py,
     ]

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

@@ -39,6 +39,42 @@ 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",
     ]