Merge branch 'main' into ci_sharding

Author: daniel-sanche

.github/CODEOWNERS

@@ -16,7 +16,6 @@
 # - @googleapis/bigtable-team
 # - @googleapis/cloud-sdk-auth-team
 # - @googleapis/cloud-sdk-python-team
-# - @googleapis/dkp-team
 # - @googleapis/firestore-team
 # - @googleapis/gcs-team
 # - @googleapis/pubsub-team
@@ -33,7 +32,6 @@
 /packages/bigquery-magics/                    @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
 /packages/db-dtypes/                          @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
 /packages/django-google-spanner/              @googleapis/spanner-team
-/packages/gcp-sphinx-docfx-yaml/              @googleapis/dkp-team
 /packages/google-auth/                        @googleapis/cloud-sdk-auth-team @googleapis/aion-team
 /packages/google-cloud-bigquery*/             @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
 /packages/google-cloud-bigtable/              @googleapis/bigtable-team

.github/release-please.yml

@@ -0,0 +1,17 @@
+handleGHRelease: true
+manifest: true
+tagPullRequestNumber: true
+
+branches:
+  - branch: main
+    handleGHRelease: true
+    tagPullRequestNumber: true
+    manifest: true
+    manifestFile: .release-please-bulk-manifest.json
+    manifestConfig: release-please-bulk-config.json
+  - branch: main
+    handleGHRelease: true
+    tagPullRequestNumber: true
+    manifest: true
+    manifestFile: .release-please-individual-manifest.json
+    manifestConfig: release-please-individual-config.json

.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/librarian_config_check.yml

@@ -49,14 +49,14 @@ jobs:
     name: ${{ matrix.package_shard.is_sharded && format('unit ({0}, {1})', matrix.python, matrix.package_shard.name) || format('unit ({0})', matrix.python) }}
     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
@@ -116,27 +116,40 @@ jobs:
         python-version: "3.10"
     - name: Set number of files changes in packages directory
       id: packages
-      run: echo "num_files_changed=$(git diff HEAD~1 -- packages | wc -l)" >> $GITHUB_OUTPUT
+      run: |
+        git diff HEAD~1 -- packages > /dev/null
+        num_files_changed=$(git diff HEAD~1 -- packages | wc -l | tr -d ' ')
+        echo "num_files_changed=${num_files_changed}" >> "$GITHUB_OUTPUT"
     - name: Install coverage
-      if: steps.packages.outputs.num_files_changed > 0
+      if: ${{ steps.packages.outputs.num_files_changed > 0 }}
       run: |
         python -m pip install --upgrade setuptools pip wheel
         python -m pip install coverage
     - name: Download coverage results
-      if: steps.packages.outputs.num_files_changed > 0
-      uses: actions/download-artifact@v4
+      if: ${{ steps.packages.outputs.num_files_changed > 0 }}
+      uses: actions/download-artifact@v5
       with:
         path: .coverage-results/
     - name: Report coverage results
-      if: steps.packages.outputs.num_files_changed > 0
+      if: ${{ steps.packages.outputs.num_files_changed > 0 }}
       env:
         # TODO: default to 100% coverage after next gapic-generator release
         # https://github.com/googleapis/google-cloud-python/issues/17459
         DEFAULT_FAIL_UNDER: 99
       run: |
         if [ -d .coverage-results ]; then
-          find .coverage-results -type f -name '.coverage*' -exec mv {} . \;
-          coverage combine
+          # Unzip any zipped coverage results
+          find .coverage-results -type f -name '*.zip' -exec unzip -o {} \;
+
+          # Find all coverage files and combine them.
+          # We find files starting with .coverage (excluding .coveragerc files and templates)
+          coverage_files=$(find .coverage-results . -type f -name '.coverage*' ! -name '.coveragerc*')
+          if [ -n "${coverage_files}" ]; then
+            coverage combine ${coverage_files}
+          else
+            echo "Error: No coverage files found to combine."
+            exit 1
+          fi
 
           # Find all modified packages
           modified_packages=$(git diff --name-only HEAD~1 -- packages | cut -d/ -f1,2 | sort -u)

.github/workflows/unittest.yml

@@ -0,0 +1,78 @@
+name: Version Scan
+
+on:
+  push:
+    branches:
+      - main
+      - '**version-scanner**'
+  schedule:
+    - cron: '0 * * * *' # Run hourly at the top of the hour
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  issues: write
+
+jobs:
+  scan:
+    name: Version Scan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.14'
+          
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pyyaml
+          
+      - name: Run Version Scanner
+        run: |
+          # Uses -o to output a detailed, raw CSV to a file
+          # Uses --stdout to print a slim, easier to parse summary to the GitHub Actions UI
+          # Uses --soft-fail to temporarily limit causing CI/CD failures during the migration to full operation. 
+          python scripts/version_scanner/version_scanner.py -d python -v 3.7 --stdout -o version_scanner_output.csv --soft-fail
+          
+      - name: Upload CSV Results
+        if: always()
+        uses: actions/upload-artifact@v7
+        with:
+          name: version-scanner-results
+          path: version_scanner_output.csv
+          
+      - name: Create or update issue on finding
+        if: failure()
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          TITLE="Version Scanner found deprecated dependencies"
+          RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          
+          # Read the first 50 lines to prevent blowing up the issue body if it's massive
+          CSV_PREVIEW=$(head -n 50 version_scanner_output.csv)
+          
+          BODY="The [Version Scanner]($RUN_URL) found deprecated dependencies in the repository.
+          
+          **Matches Found:**
+          \`\`\`csv
+          $CSV_PREVIEW
+          \`\`\`
+          *(If there are more than 50 matches, see the workflow logs for the full list)*"
+
+          # Mirroring regenerate-all.yml: check if an issue already exists to prevent spam
+          EXISTING_ISSUE=$(gh issue list --state open --search "in:title \"$TITLE\"" --json number --jq '.[0].number')
+          
+          if [ -z "$EXISTING_ISSUE" ]; then
+            echo "WOULD HAVE CREATED ISSUE:"
+            echo "gh issue create --title \"$TITLE\" --body \"$BODY\""
+            # gh issue create --title "$TITLE" --body "$BODY"
+          else
+            echo "Issue #$EXISTING_ISSUE already exists."
+            echo "WOULD HAVE ADDED COMMENT:"
+            echo "gh issue comment \"$EXISTING_ISSUE\" --body \"Another scanner run found deprecated dependencies: $RUN_URL\""
+            # gh issue comment "$EXISTING_ISSUE" --body "Another scanner run found deprecated dependencies: $RUN_URL"
+          fi

.github/workflows/version_scanner.yml

@@ -564,6 +564,34 @@ replacements:
           "freezegun",
       ]
     count: 1
+  - paths: [
+      packages/google-cloud-firestore/noxfile.py
+    ]
+    before: |
+      SYSTEM_TEST_STANDARD_DEPENDENCIES = \[
+          "mock",
+          "pytest",
+          "google-cloud-testutils",
+      \]
+    after: |
+      SYSTEM_TEST_STANDARD_DEPENDENCIES = [
+          "mock",
+          "pytest",
+      ]
+    count: 1
+  - paths: [
+      packages/google-cloud-firestore/noxfile.py
+    ]
+    before: |
+      SYSTEM_TEST_LOCAL_DEPENDENCIES: List\[str\] = \[\]
+    after: |
+      SYSTEM_TEST_LOCAL_DEPENDENCIES: List[str] = [
+          "../google-cloud-testutils"
+      ]
+    count: 1
+  # TODO(https://github.com/googleapis/google-cloud-python/issues/17429):
+  # Temporary post-processing rule to add pytest-xdist dependency.
+  # Remove this once gapic-generator includes pytest-xdist by default.
   - paths: [
       packages/google-cloud-firestore/noxfile.py
     ]
@@ -574,6 +602,7 @@ replacements:
           "pytest-asyncio",
           "six",
           "pyyaml",
+          "pytest-xdist",
       ]
     count: 1
   - paths: [
@@ -584,6 +613,54 @@ replacements:
     after: |
       "pytest-asyncio==0.21.2",
     count: 2
+  # TODO(https://github.com/googleapis/google-cloud-python/issues/17429):
+  # Temporary post-processing rule to inject `-n auto` for Firestore parallel tests.
+  # This rule should be removed once the generator template changes are released
+  # and the generator version is updated in librarian.yaml.
+  - paths: [
+      packages/google-cloud-firestore/noxfile.py
+    ]
+    before: |
+      # Run py.test against the system tests\.
+      if system_test_exists:
+          session\.run\(
+              "py.test",
+              "--quiet",
+              f"--junitxml=system_\{session\.python\}_sponge_log\.xml",
+              system_test_path,
+              \*session\.posargs,
+          \)
+      if system_test_folder_exists:
+          session\.run\(
+              "py.test",
+              "--quiet",
+              f"--junitxml=system_\{session\.python\}_sponge_log\.xml",
+              system_test_folder_path,
+              \*session\.posargs,
+          \)
+    after: |
+      # Run py.test against the system tests.
+      if system_test_exists:
+          session.run(
+              "py.test",
+              "-n",
+              "10",
+              "--quiet",
+              f"--junitxml=system_{session.python}_sponge_log.xml",
+              system_test_path,
+              *session.posargs,
+          )
+      if system_test_folder_exists:
+          session.run(
+              "py.test",
+              "-n",
+              "10",
+              "--quiet",
+              f"--junitxml=system_{session.python}_sponge_log.xml",
+              system_test_folder_path,
+              *session.posargs,
+          )
+    count: 1
   - paths: [
       "packages/google-cloud-firestore/docs/conf.py",
     ]