Merge branch 'main' into fix-empty-last-chunk

Author: chalmerlowe

.coveragerc

@@ -1,5 +1,8 @@
 [report]
-omit = */samples/*
+omit =
+    */samples/*
+    # Issue tracked in https://github.com/googleapis/google-api-python-client/issues/2132
+    describe.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER

.github/.OwlBot.lock.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:81ed5ecdfc7cac5b699ba4537376f3563f6f04122c4ec9e735d3b3dc1d43dd32
-# created: 2022-05-05T22:08:23.383410683Z
+  digest: sha256:543e209e7c1c1ffe720eb4db1a3f045a75099304fb19aa11a47dc717b8aae2a9
+# created: 2025-10-09T14:48:42.914384887Z

.github/CODEOWNERS

@@ -4,14 +4,14 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/yoshi-python is the default owner for changes in this repo
-*               @googleapis/yoshi-python
+# Default owners for changes in this repo
+*               @googleapis/yoshi-python @googleapis/python-core-client-libraries
 
 # The python-samples-reviewers team is the default owner for samples changes
-/samples/  @googleapis/python-samples-owners
+/samples/  @googleapis/python-samples-owners @googleapis/python-core-client-libraries
 
 # For more information, see https://github.com/googleapis/repo-automation-bots/blob/main/packages/auto-approve/README.md
-.github/auto-approve.yml @googleapis/github-automation @googleapis/yoshi-python
+.github/auto-approve.yml @googleapis/python-core-client-libraries @googleapis/yoshi-python
 
 # The following is needed to auto-approve changes to static discovery artifacts and generated documentation.
 /docs/dyn/*.html                                         @yoshi-approver @googleapis/yoshi-python

.github/auto-approve.yml

@@ -1,3 +1,4 @@
 # https://github.com/googleapis/repo-automation-bots/tree/main/packages/auto-approve
 processes:
+  - "UpdateDiscoveryArtifacts"
   - "OwlBotTemplateChanges"

.github/auto-label.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,3 +13,8 @@
 # limitations under the License.
 requestsize:
   enabled: true
+
+path:
+  pullrequest: true
+  paths:
+    samples: "samples"

.github/blunderbuss.yml

@@ -0,0 +1,17 @@
+# Blunderbuss config
+#
+# This file controls who is assigned for pull requests and issues.
+# Note: This file is autogenerated. To make changes to the assignee
+# team, please update `codeowner_team` in `.repo-metadata.json`.
+
+assign_issues:
+  - googleapis/python-core-client-libraries
+
+assign_issues_by:
+  - labels:
+      - "samples"
+    to:
+      - googleapis/python-samples-reviewers
+      
+assign_prs:
+  - googleapis/python-core-client-libraries

.github/release-trigger.yml

@@ -1 +1,2 @@
 enabled: true
+multiScmName: google-api-python-client

.github/sync-repo-settings.yaml

@@ -15,6 +15,10 @@ branchProtectionRules:
     - 'Samples - Python 3.8'
     - 'Samples - Python 3.9'
     - 'Samples - Python 3.10'
+    - 'Samples - Python 3.11'
+    - 'Samples - Python 3.12'
+    - 'Samples - Python 3.13'
+    - 'Samples - Python 3.14'
 permissionRules:
   - team: actools-python
     permission: admin

.github/workflows/main.yml

@@ -20,6 +20,7 @@ on:
     # * is a special character in YAML so you have to quote this string
     # Run this Github Action every Tuesday at 7 AM UTC
     - cron:  '0 7 * * 2'
+  workflow_dispatch:
 
 jobs:
   build:
@@ -29,19 +30,28 @@ jobs:
     steps:
       - name: Get current date
         id: date
-        run: echo "::set-output name=current_date::$(date +'%Y-%m-%d')"
+        run: echo "::set-output name=current_date::$(date +'%Y-%m-%d-%HH%MM%SS')"
+
+      - name: Sync fork
+        run: gh repo sync $REPOSITORY -b $BRANCH_NAME
+        env:
+          REPOSITORY: 'yoshi-code-bot/google-api-python-client'
+          BRANCH_NAME: 'refs/heads/main'
+          GITHUB_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }}
 
       - name: Check out main branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: refs/heads/main
+          repository: 'yoshi-code-bot/google-api-python-client'
+          token: ${{secrets.YOSHI_CODE_BOT_TOKEN}}
 
       - name: Create branch
         run: |
           git checkout -b update-discovery-artifacts-${{ steps.date.outputs.current_date }}
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 
@@ -68,7 +78,7 @@ jobs:
         working-directory: ./scripts
 
       - name: Push changes
-        run: git push -f --set-upstream origin update-discovery-artifacts-${{ steps.date.outputs.current_date }}
+        run: git push -u origin update-discovery-artifacts-${{ steps.date.outputs.current_date }}
 
       - name: Prepare summary for PR Body
         id: pr_body
@@ -83,43 +93,8 @@ jobs:
         working-directory: ./scripts
 
       - name: Create PR
-        uses: actions/github-script@v6.1.0
-        with:
-          github-token: ${{secrets.YOSHI_CODE_BOT_TOKEN}}
-          script: |
-            async function createPR () {
-              const { owner, repo } = context.repo
-              const branch = 'update-discovery-artifacts-${{ steps.date.outputs.current_date }}'
-              let prBody = `${{ steps.pr_body.outputs.change_summary }}`
-              const prTitle = 'chore: Update discovery artifacts'
-              const pullRequests = await github.rest.pulls.list({
-                owner: owner,
-                repo: repo,
-                head: `${owner}:${branch}`,
-                state: 'open'
-              })
-
-              if (pullRequests.data.length === 1) {
-                prNumber = pullRequests.data[0].number
-                await github.rest.pulls.update({
-                  owner: owner,
-                  repo: repo,
-                  pull_number: prNumber,
-                  title: prTitle,
-                  body: prBody
-                })
-                console.log('Updated PR')
-              } else {
-                const createPrResult = await github.rest.pulls.create({
-                  owner: owner,
-                  repo: repo,
-                  base: 'main',
-                  head: `${owner}:${branch}`,
-                  title: prTitle,
-                  body: prBody
-                })
-                prNumber = createPrResult.data.number
-                console.log('Created PR')
-              }
-            }
-            createPR()
+        env:
+          GITHUB_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }}
+          PR_TITLE: "chore: Update discovery artifacts"
+        run: |
+          gh pr create -R "googleapis/google-api-python-client" -B "main" --title "$PR_TITLE" --body "${{ steps.pr_body.outputs.change_summary }}"

.kokoro/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +15,13 @@
 
 set -eo pipefail
 
+CURRENT_DIR=$(dirname "${BASH_SOURCE[0]}")
+
 if [[ -z "${PROJECT_ROOT:-}" ]]; then
-    PROJECT_ROOT="github/google-api-python-client"
+  PROJECT_ROOT=$(realpath "${CURRENT_DIR}/..")
 fi
 
-cd "${PROJECT_ROOT}"
+pushd "${PROJECT_ROOT}"
 
 # Disable buffering, so that the logs stream through.
 export PYTHONUNBUFFERED=1
@@ -28,17 +30,16 @@ export PYTHONUNBUFFERED=1
 env | grep KOKORO
 
 # Setup service account credentials.
-export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
+if [[ -f "${KOKORO_GFILE_DIR}/service-account.json" ]]
+then
+  export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
+fi
 
 # Setup project id.
-export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
-
-# Remove old nox
-python3 -m pip uninstall --yes --quiet nox-automation
-
-# Install nox
-python3 -m pip install --upgrade --quiet nox
-python3 -m nox --version
+if [[ -f "${KOKORO_GFILE_DIR}/project-id.json" ]]
+then
+  export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
+fi
 
 # If this is a continuous build, send the test log to the FlakyBot.
 # See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
@@ -53,7 +54,7 @@ fi
 # If NOX_SESSION is set, it only runs the specified session,
 # otherwise run all the sessions.
 if [[ -n "${NOX_SESSION:-}" ]]; then
-    python3 -m nox -s ${NOX_SESSION:-}
+  python3 -m nox -s ${NOX_SESSION:-}
 else
-    python3 -m nox
+  python3 -m nox
 fi