Merge branch 'main' into streaming-retry-showcase-tests

Author: parthea

.bazelrc

@@ -1,2 +1,2 @@
-# New boringssl requires C++14
-build --repo_env=BAZEL_CXXOPTS="-std=c++14"
+# New protobuf requires C++17
+build --repo_env=BAZEL_CXXOPTS="-std=c++17"

.dockerignore

@@ -2,10 +2,6 @@
 .git
 .gitignore
 
-# Docker scaffolding
-Dockerfile
-.dockerignore
-
 # Python scaffolding
 *.py[cod]
 *.egg

.github/workflows/tests.yaml

@@ -21,7 +21,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
         uses: actions/setup-python@v5
         # Use python 3.10 for docs to match the version for the sphinx plugin
@@ -33,6 +33,21 @@ jobs:
         run: python -m pip install nox
       - name: Build the documentation.
         run: nox -s docs
+  docfx:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        # Use python 3.10 for docs to match the version for the sphinx plugin
+        # https://github.com/googleapis/synthtool/pull/1891
+        with:
+          python-version: "3.10"
+          cache: 'pip'
+      - name: Install nox.
+        run: python -m pip install nox
+      - name: Build the documentation.
+        run: nox -s docfx
   mypy:
     strategy:
       matrix:
@@ -41,7 +56,7 @@ jobs:
         python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python "${{ matrix.python }}"
         uses: actions/setup-python@v5
         with:
@@ -64,7 +79,7 @@ jobs:
     # Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python "${{ matrix.python }}"
         uses: actions/setup-python@v5
         with:
@@ -106,7 +121,7 @@ jobs:
       max-parallel: 1
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup temp directory
         run: |
           sudo mkdir -p /tmp/workspace/tests/cert/
@@ -156,7 +171,7 @@ jobs:
     # Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python "${{ matrix.python }}"
         uses: actions/setup-python@v5
         with:
@@ -184,7 +199,7 @@ jobs:
   showcase-unit-add-iam-methods:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python "3.13"
         uses: actions/setup-python@v5
         with:
@@ -212,7 +227,7 @@ jobs:
       matrix:
         variant: ['', _alternative_templates]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python "3.13"
         uses: actions/setup-python@v5
         with:
@@ -237,7 +252,7 @@ jobs:
   snippetgen:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python "3.13"
         uses: actions/setup-python@v5
         with:
@@ -260,7 +275,7 @@ jobs:
     # Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v5
         with:
@@ -285,7 +300,7 @@ jobs:
     # Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v5
         with:
@@ -304,7 +319,7 @@ jobs:
     runs-on: ubuntu-latest
     container: gcr.io/gapic-images/googleapis
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Cache Bazel files
         id: cache-bazel
         uses: actions/cache@v4
@@ -332,7 +347,7 @@ jobs:
   goldens-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
@@ -351,7 +366,7 @@ jobs:
   goldens-unit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
@@ -372,7 +387,7 @@ jobs:
   goldens-prerelease:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
@@ -393,7 +408,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python "3.13"
         uses: actions/setup-python@v5
         with:

CHANGELOG.md

@@ -1,6 +1,47 @@
 # Changelog
 
 
+## [1.26.1](https://github.com/googleapis/gapic-generator-python/compare/v1.26.0...v1.26.1) (2025-08-28)
+
+
+### Bug Fixes
+
+* Temporarily disable `test_<service>_api_version_header_async` which is not marked as async ([9382ac3](https://github.com/googleapis/gapic-generator-python/commit/9382ac3546f335116665e10c4132369bc7637a67))
+
+## [1.26.0](https://github.com/googleapis/gapic-generator-python/compare/v1.25.0...v1.26.0) (2025-05-28)
+
+
+### Features
+
+* Add client debug logging support for server side streaming REST calls ([#2340](https://github.com/googleapis/gapic-generator-python/issues/2340)) ([8a705c5](https://github.com/googleapis/gapic-generator-python/commit/8a705c513fe63b025eca738feb64a1e414f9f4b6))
+
+## [1.25.0](https://github.com/googleapis/gapic-generator-python/compare/v1.24.1...v1.25.0) (2025-05-06)
+
+
+### Features
+
+* Add protobuf runtime version to `x-goog-api-client` header ([#2368](https://github.com/googleapis/gapic-generator-python/issues/2368)) ([9c05dbe](https://github.com/googleapis/gapic-generator-python/commit/9c05dbeb9285919f45924be09c445b707cb85b54))
+
+## [1.24.1](https://github.com/googleapis/gapic-generator-python/compare/v1.24.0...v1.24.1) (2025-04-17)
+
+
+### Bug Fixes
+
+* Update generated docs to match synthtool templates ([3f62f31](https://github.com/googleapis/gapic-generator-python/commit/3f62f31d5146147c4bc6393fbeef18ce1d9a1a42))
+
+## [1.24.0](https://github.com/googleapis/gapic-generator-python/compare/v1.23.6...v1.24.0) (2025-04-11)
+
+
+### Features
+
+* Adds augmented pagination to account for BQ family of APIs ([#2372](https://github.com/googleapis/gapic-generator-python/issues/2372)) ([30cd1a4](https://github.com/googleapis/gapic-generator-python/commit/30cd1a49353048fc190114cfb7a73e14ec2eff31))
+
+
+### Bug Fixes
+
+* Fixed internal method generation naming issues ([#2365](https://github.com/googleapis/gapic-generator-python/issues/2365)) ([868f201](https://github.com/googleapis/gapic-generator-python/commit/868f201957b271c9390bf41374897a2ce728a5e2))
+* Missing DEFAULT_HOST should still result in compiling code ([#2051](https://github.com/googleapis/gapic-generator-python/issues/2051)) ([dc6d4f7](https://github.com/googleapis/gapic-generator-python/commit/dc6d4f7ec0853557bb7c25a8276fbe262c5bda5d))
+
 ## [1.23.6](https://github.com/googleapis/gapic-generator-python/compare/v1.23.5...v1.23.6) (2025-03-17)
 
 

Dockerfile

@@ -60,9 +60,9 @@ gapic_generator_python()
 
 gapic_generator_register_toolchains()
 
-_grpc_version = "1.67.1"
+_grpc_version = "1.71.0"
 
-_grpc_sha256 = "f83aedc91b84d4c396d30b0b2a30f7113c651fe5bc180c8ac08a5f0ff7dcffd2"
+_grpc_sha256 = "9313c3f8f4dd3341597f152d506a50caf571fe40f886e24ea9078891990df285"
 
 http_archive(
     name = "com_github_grpc_grpc",
@@ -71,29 +71,38 @@ http_archive(
     urls = ["https://github.com/grpc/grpc/archive/v%s.zip" % _grpc_version],
 )
 # instantiated in grpc_deps().
+
+_protobuf_version = "30.2"
+
+_protobuf_sha256 = "07a43d88fe5a38e434c7f94129cad56a4c43a51f99336074d0799c2f7d4e44c5"
+
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e",
-    strip_prefix = "protobuf-29.3",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v29.3.tar.gz"],
+    sha256 = _protobuf_sha256,
+    strip_prefix = "protobuf-%s" % _protobuf_version,
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v%s.tar.gz" % _protobuf_version],
 )
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 
 grpc_deps()
 
-# Pin the version of rules_cc to the version that is present in
-# https://github.com/protocolbuffers/protobuf/blob/29.x/protobuf_deps.bzl#L92-L98
 http_archive(
     name = "rules_cc",
-    urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.16/rules_cc-0.0.16.tar.gz"],
-    sha256 = "bbf1ae2f83305b7053b11e4467d317a7ba3517a12cef608543c1b1c5bf48a4df",
-    strip_prefix = "rules_cc-0.0.16",
+    urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz"],
+    sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42",
+    strip_prefix = "rules_cc-0.1.1",
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps", "PROTOBUF_MAVEN_ARTIFACTS")
 # This is actually already done within grpc_deps but calling this for Bazel convention.
 protobuf_deps()
 
+# Add rules_java to resolve the following error
+# `The repository '@compatibility_proxy' could not be resolved: Repository '@compatibility_proxy' is not defined`
+load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
+
+rules_java_dependencies()
+
 # gRPC enforces a specific version of Go toolchain which conflicts with our build.
 # All the relevant parts of grpc_extra_deps() are imported in this  WORKSPACE file
 # explicitly, that is why we do not call grpc_extra_deps() here and call

WORKSPACE

@@ -40,7 +40,7 @@
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #
-# needs_sphinx = '1.0'
+needs_sphinx = "4.5.0"
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

docker-entrypoint.sh

@@ -1,8 +1,8 @@
 Verifying the Library
 ---------------------
 
-Once you have compiled a client library, whether using a Docker image,
-local installation or bazel, it is time for the fun part: actually running it!
+Once you have compiled a client library, whether using a local installation
+or bazel, it is time for the fun part: actually running it!
 
 Create a virtual environment for the library: