From cb612c2c196b3aa1234c08946d0c591093814dc3 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Mon, 20 Apr 2026 06:53:30 +0000 Subject: [PATCH 1/5] chore: allow docs warnings in more packages Renames the post-processing file, and adds more paths to it. This file should be removed entirely once we've upgraded to a later version of the GAPIC generator which fixes the warnings. See #15475 for details on this work. --- ...ping-merchant-accounts.yaml => allow-docs-warnings.yaml} | 6 ++++++ 1 file changed, 6 insertions(+) rename .librarian/generator-input/client-post-processing/{allow-docs-warnings-for-google-shopping-merchant-accounts.yaml => allow-docs-warnings.yaml} (74%) diff --git a/.librarian/generator-input/client-post-processing/allow-docs-warnings-for-google-shopping-merchant-accounts.yaml b/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml similarity index 74% rename from .librarian/generator-input/client-post-processing/allow-docs-warnings-for-google-shopping-merchant-accounts.yaml rename to .librarian/generator-input/client-post-processing/allow-docs-warnings.yaml index 0ed1bab55e2d..01aadaef6b77 100644 --- a/.librarian/generator-input/client-post-processing/allow-docs-warnings-for-google-shopping-merchant-accounts.yaml +++ b/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml @@ -16,6 +16,12 @@ url: https://github.com/googleapis/gapic-generator-python/issues/2490 replacements: - paths: [ packages/google-shopping-merchant-accounts/noxfile.py, + packages/google-cloud-compute/noxfile.py, + packages/google-cloud-compute-v1beta/noxfile.py, + packages/google-cloud-container/noxfile.py, + packages/google-cloud-dataplex/noxfile.py, + packages/google-cloud-network-connectivity/noxfile.py, + packages/google-cloud-recaptcha-enterprise/noxfile.py, ] before: ' "-W", # warnings as errors\n' after: '' From a40092de4143f1b3a8b5369f06a9923b32761b96 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Mon, 20 Apr 2026 07:08:06 +0000 Subject: [PATCH 2/5] chore: add dialogflow-cx and sort --- .../client-post-processing/allow-docs-warnings.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml b/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml index 01aadaef6b77..d610f0c2f225 100644 --- a/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml +++ b/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml @@ -15,13 +15,14 @@ description: Allow documentation warnings for google-shopping-merchant-accounts url: https://github.com/googleapis/gapic-generator-python/issues/2490 replacements: - paths: [ - packages/google-shopping-merchant-accounts/noxfile.py, packages/google-cloud-compute/noxfile.py, packages/google-cloud-compute-v1beta/noxfile.py, packages/google-cloud-container/noxfile.py, packages/google-cloud-dataplex/noxfile.py, + packages/google-cloud-dialogflow-cx/noxfile.py, packages/google-cloud-network-connectivity/noxfile.py, packages/google-cloud-recaptcha-enterprise/noxfile.py, + packages/google-shopping-merchant-accounts/noxfile.py, ] before: ' "-W", # warnings as errors\n' after: '' From cc2802fda3e7607aaafd089bb02b098ed1c8e52f Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Mon, 20 Apr 2026 07:13:40 +0000 Subject: [PATCH 3/5] chore: split replacements into one entry per package --- .../allow-docs-warnings.yaml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml b/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml index d610f0c2f225..60fb84dca2ed 100644 --- a/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml +++ b/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml @@ -13,15 +13,53 @@ # limitations under the License. description: Allow documentation warnings for google-shopping-merchant-accounts due to formatting issue in google/protobuf/empty.proto url: https://github.com/googleapis/gapic-generator-python/issues/2490 +# Note: having one replacement per package instead of just listing the paths +# is annoying, but that's what synthtool expects and it's not worth fixing that +# at this stage. replacements: - paths: [ packages/google-cloud-compute/noxfile.py, + ] + before: ' "-W", # warnings as errors\n' + after: '' + count: 1 + - paths: [ packages/google-cloud-compute-v1beta/noxfile.py, + ] + before: ' "-W", # warnings as errors\n' + after: '' + count: 1 + - paths: [ packages/google-cloud-container/noxfile.py, + ] + before: ' "-W", # warnings as errors\n' + after: '' + count: 1 + - paths: [ packages/google-cloud-dataplex/noxfile.py, + ] + before: ' "-W", # warnings as errors\n' + after: '' + count: 1 + - paths: [ packages/google-cloud-dialogflow-cx/noxfile.py, + ] + before: ' "-W", # warnings as errors\n' + after: '' + count: 1 + - paths: [ packages/google-cloud-network-connectivity/noxfile.py, + ] + before: ' "-W", # warnings as errors\n' + after: '' + count: 1 + - paths: [ packages/google-cloud-recaptcha-enterprise/noxfile.py, + ] + before: ' "-W", # warnings as errors\n' + after: '' + count: 1 + - paths: [ packages/google-shopping-merchant-accounts/noxfile.py, ] before: ' "-W", # warnings as errors\n' From a441f6c1ab730054b69818c48d2e06082bb7902f Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Mon, 20 Apr 2026 07:01:29 +0000 Subject: [PATCH 4/5] test only --- librarian.yaml | 1 - .../.repo-metadata.json | 27 ++++++++++--------- .../google-cloud-dialogflow-cx/README.rst | 3 ++- .../docs/README.rst | 3 ++- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/librarian.yaml b/librarian.yaml index 1474e1b36e00..e070fd60bf27 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -1817,7 +1817,6 @@ libraries: keep: - CHANGELOG.md - docs/CHANGELOG.md - skip_generate: true python: opt_args_by_api: google/cloud/dialogflow/cx/v3: diff --git a/packages/google-cloud-dialogflow-cx/.repo-metadata.json b/packages/google-cloud-dialogflow-cx/.repo-metadata.json index 061e9e93eb7b..e7b8df5971ad 100644 --- a/packages/google-cloud-dialogflow-cx/.repo-metadata.json +++ b/packages/google-cloud-dialogflow-cx/.repo-metadata.json @@ -1,15 +1,16 @@ { - "api_id": "dialogflow.googleapis.com", - "api_shortname": "dialogflow", - "client_documentation": "https://cloud.google.com/python/docs/reference/dialogflow-cx/latest", - "default_version": "v3", - "distribution_name": "google-cloud-dialogflow-cx", - "issue_tracker": "https://issuetracker.google.com/savedsearches/5300385", - "language": "python", - "library_type": "GAPIC_AUTO", - "name": "dialogflow-cx", - "name_pretty": "Dialogflow CX", - "product_documentation": "https://cloud.google.com/dialogflow/cx/docs", - "release_level": "stable", - "repo": "googleapis/google-cloud-python" + "api_description": "Builds conversational interfaces (for example, chatbots, and voice-powered\napps and devices).", + "api_id": "dialogflow.googleapis.com", + "api_shortname": "dialogflow", + "client_documentation": "https://cloud.google.com/python/docs/reference/dialogflow-cx/latest", + "default_version": "v3", + "distribution_name": "google-cloud-dialogflow-cx", + "issue_tracker": "https://issuetracker.google.com/savedsearches/5300385", + "language": "python", + "library_type": "GAPIC_AUTO", + "name": "dialogflow-cx", + "name_pretty": "Dialogflow CX", + "product_documentation": "https://cloud.google.com/dialogflow/cx/docs", + "release_level": "stable", + "repo": "googleapis/google-cloud-python" } \ No newline at end of file diff --git a/packages/google-cloud-dialogflow-cx/README.rst b/packages/google-cloud-dialogflow-cx/README.rst index 7645aae0b3a3..bfad9bcb312e 100644 --- a/packages/google-cloud-dialogflow-cx/README.rst +++ b/packages/google-cloud-dialogflow-cx/README.rst @@ -3,7 +3,8 @@ Python Client for Dialogflow CX |stable| |pypi| |versions| -`Dialogflow CX`_: +`Dialogflow CX`_: Builds conversational interfaces (for example, chatbots, and voice-powered +apps and devices). - `Client Library Documentation`_ - `Product Documentation`_ diff --git a/packages/google-cloud-dialogflow-cx/docs/README.rst b/packages/google-cloud-dialogflow-cx/docs/README.rst index 7645aae0b3a3..bfad9bcb312e 100644 --- a/packages/google-cloud-dialogflow-cx/docs/README.rst +++ b/packages/google-cloud-dialogflow-cx/docs/README.rst @@ -3,7 +3,8 @@ Python Client for Dialogflow CX |stable| |pypi| |versions| -`Dialogflow CX`_: +`Dialogflow CX`_: Builds conversational interfaces (for example, chatbots, and voice-powered +apps and devices). - `Client Library Documentation`_ - `Product Documentation`_ From 1148a088e33929ae18efc87179606ec718225f3c Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Mon, 20 Apr 2026 07:18:47 +0000 Subject: [PATCH 5/5] chore: regenerate having fixed file --- packages/google-cloud-dialogflow-cx/noxfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/google-cloud-dialogflow-cx/noxfile.py b/packages/google-cloud-dialogflow-cx/noxfile.py index 81e5eff6cbe1..25d4b5fca8e2 100644 --- a/packages/google-cloud-dialogflow-cx/noxfile.py +++ b/packages/google-cloud-dialogflow-cx/noxfile.py @@ -390,7 +390,6 @@ def docs(session): shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( "sphinx-build", - "-W", # warnings as errors "-T", # show full traceback on exception "-N", # no colors "-b",