From f09560909ef341d2b22dd1967b5e46b701e25523 Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Wed, 28 Oct 2026 12:21:48 -0400 Subject: [PATCH 1/5] test: pin pytest<9.2 in failing handwritten packages --- packages/db-dtypes/noxfile.py | 6 +++--- packages/google-api-core/noxfile.py | 2 +- packages/google-auth-httplib2/noxfile.py | 4 ++-- packages/google-cloud-core/noxfile.py | 6 +++--- packages/google-cloud-dns/noxfile.py | 4 ++-- packages/google-cloud-documentai-toolbox/noxfile.py | 4 ++-- packages/google-cloud-error-reporting/noxfile.py | 4 ++-- packages/google-cloud-firestore/noxfile.py | 4 ++-- packages/google-cloud-logging/noxfile.py | 4 ++-- packages/google-cloud-pubsub/noxfile.py | 4 ++-- packages/google-cloud-runtimeconfig/noxfile.py | 4 ++-- packages/google-cloud-testutils/noxfile.py | 7 ++++--- packages/proto-plus/noxfile.py | 6 +++--- 13 files changed, 30 insertions(+), 29 deletions(-) diff --git a/packages/db-dtypes/noxfile.py b/packages/db-dtypes/noxfile.py index 5d0c8b4980a9..5b0e797f881f 100644 --- a/packages/db-dtypes/noxfile.py +++ b/packages/db-dtypes/noxfile.py @@ -48,7 +48,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -61,7 +61,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] @@ -262,7 +262,7 @@ def prerelease(session, tests_path): session.install( "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", # tzdata is only needed for testing: pandas 3.0+ no longer installs diff --git a/packages/google-api-core/noxfile.py b/packages/google-api-core/noxfile.py index 4ae56dc0f008..584ec1ca63de 100644 --- a/packages/google-api-core/noxfile.py +++ b/packages/google-api-core/noxfile.py @@ -220,7 +220,7 @@ def default( unittest.skip("The pre-release session cannot be run without grpc") session.install( - "pytest", + "pytest<9.2", "pytest-cov", "pytest-mock", "pytest-xdist", diff --git a/packages/google-auth-httplib2/noxfile.py b/packages/google-auth-httplib2/noxfile.py index e0a9b93502a4..fd45282ed298 100644 --- a/packages/google-auth-httplib2/noxfile.py +++ b/packages/google-auth-httplib2/noxfile.py @@ -44,7 +44,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -60,7 +60,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.10"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-core/noxfile.py b/packages/google-cloud-core/noxfile.py index 772c0c136b3d..dbff5c4737c6 100644 --- a/packages/google-cloud-core/noxfile.py +++ b/packages/google-cloud-core/noxfile.py @@ -136,7 +136,7 @@ def default(session): ) # Install all test dependencies, then install local packages in-place. - session.install("pytest", "pytest-cov", "-c", constraints_path) + session.install("pytest<9.2", "pytest-cov", "-c", constraints_path) session.install("-e", ".[grpc]", "-c", constraints_path) # Run py.test against the unit tests. @@ -275,7 +275,7 @@ def prerelease_deps(session, protobuf_implementation): """Run all tests with prerelease versions of dependencies installed.""" # Install all test dependencies, then install local packages in-place. - session.install("pytest", "pytest-cov") + session.install("pytest<9.2", "pytest-cov") session.install("-e", ".[grpc]") # Because we test minimum dependency versions on the minimum Python @@ -362,7 +362,7 @@ def core_deps_from_source(session, protobuf_implementation): """ # Install all test dependencies, then install local packages in-place. - session.install("pytest", "pytest-cov") + session.install("pytest<9.2", "pytest-cov") session.install("-e", ".[grpc]") # Because we test minimum dependency versions on the minimum Python diff --git a/packages/google-cloud-dns/noxfile.py b/packages/google-cloud-dns/noxfile.py index 0c6507c42a5d..45cf5c6865f8 100644 --- a/packages/google-cloud-dns/noxfile.py +++ b/packages/google-cloud-dns/noxfile.py @@ -46,7 +46,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -58,7 +58,7 @@ SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-documentai-toolbox/noxfile.py b/packages/google-cloud-documentai-toolbox/noxfile.py index e6ac183ea803..3d7cc9a93ca4 100644 --- a/packages/google-cloud-documentai-toolbox/noxfile.py +++ b/packages/google-cloud-documentai-toolbox/noxfile.py @@ -47,7 +47,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -60,7 +60,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-error-reporting/noxfile.py b/packages/google-cloud-error-reporting/noxfile.py index 4c37e91d4b4e..976817405aac 100644 --- a/packages/google-cloud-error-reporting/noxfile.py +++ b/packages/google-cloud-error-reporting/noxfile.py @@ -66,7 +66,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -79,7 +79,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-firestore/noxfile.py b/packages/google-cloud-firestore/noxfile.py index b83aa0a5c973..9b32e589f557 100644 --- a/packages/google-cloud-firestore/noxfile.py +++ b/packages/google-cloud-firestore/noxfile.py @@ -66,7 +66,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio==0.21.2", ] @@ -83,7 +83,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest", + "pytest<9.2", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [ "pytest-asyncio==0.21.2", diff --git a/packages/google-cloud-logging/noxfile.py b/packages/google-cloud-logging/noxfile.py index f8468c73410f..6720bf25dcf7 100644 --- a/packages/google-cloud-logging/noxfile.py +++ b/packages/google-cloud-logging/noxfile.py @@ -66,7 +66,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -83,7 +83,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [ diff --git a/packages/google-cloud-pubsub/noxfile.py b/packages/google-cloud-pubsub/noxfile.py index 219dbea9718f..6b6f12108191 100644 --- a/packages/google-cloud-pubsub/noxfile.py +++ b/packages/google-cloud-pubsub/noxfile.py @@ -66,7 +66,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -81,7 +81,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [ diff --git a/packages/google-cloud-runtimeconfig/noxfile.py b/packages/google-cloud-runtimeconfig/noxfile.py index c8ddaaa120ef..c622ef48889f 100644 --- a/packages/google-cloud-runtimeconfig/noxfile.py +++ b/packages/google-cloud-runtimeconfig/noxfile.py @@ -46,7 +46,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest", + "pytest<9.2", "pytest-cov", "pytest-asyncio", ] @@ -59,7 +59,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest", + "pytest<9.2", "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-testutils/noxfile.py b/packages/google-cloud-testutils/noxfile.py index 5a5809c9d760..a94c166b3cc1 100644 --- a/packages/google-cloud-testutils/noxfile.py +++ b/packages/google-cloud-testutils/noxfile.py @@ -16,6 +16,7 @@ from __future__ import absolute_import + import os import pathlib import re @@ -154,7 +155,7 @@ def unit(session): "-e", "tests/unit/resources/good_package", "tests/unit/resources/bad_package" ) - session.install("pytest", "pytest-cov") + session.install("pytest<9.2", "pytest-cov") session.install("-e", ".", "-c", constraints_path) # Run py.test against the unit tests. @@ -303,7 +304,7 @@ def prerelease_deps(session): "-e", "tests/unit/resources/good_package", "tests/unit/resources/bad_package" ) - session.install("pytest", "pytest-cov") + session.install("pytest<9.2", "pytest-cov") session.install("-e", ".", "-c", constraints_path) # Because we test minimum dependency versions on the minimum Python @@ -371,7 +372,7 @@ def core_deps_from_source(session): "-e", "tests/unit/resources/good_package", "tests/unit/resources/bad_package" ) - session.install("pytest", "pytest-cov") + session.install("pytest<9.2", "pytest-cov") session.install("-e", ".", "-c", constraints_path) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/proto-plus/noxfile.py b/packages/proto-plus/noxfile.py index fbdee3b362e0..83181bbdd0d5 100644 --- a/packages/proto-plus/noxfile.py +++ b/packages/proto-plus/noxfile.py @@ -64,7 +64,7 @@ def unit(session, implementation): ) session.env["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = implementation - session.install("coverage", "pytest", "pytest-cov", "pytz") + session.install("coverage", "pytest<9.2", "pytest-cov", "pytz") session.install("-e", ".[testing]", "-c", constraints_path) # TODO(https://github.com/googleapis/proto-plus-python/issues/403): re-enable `-W=error` @@ -100,7 +100,7 @@ def prerelease_deps(session, implementation): session.env["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = implementation # Install test environment dependencies - session.install("coverage", "pytest", "pytest-cov", "pytz") + session.install("coverage", "pytest<9.2", "pytest-cov", "pytz") # Install the package without dependencies session.install("-e", ".", "--no-deps") @@ -157,7 +157,7 @@ def core_deps_from_source(session, implementation): session.env["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = implementation # Install test environment dependencies - session.install("coverage", "pytest", "pytest-cov", "pytz") + session.install("coverage", "pytest<9.2", "pytest-cov", "pytz") # Install the package without dependencies session.install("-e", ".", "--no-deps") From e1b924f3ac0f0adf9297fc4124eb97ddda64a176 Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Wed, 28 Oct 2026 12:52:23 -0400 Subject: [PATCH 2/5] test: use PYTEST_VERSION constant with comments and update post-processing rules --- .../firestore-integration.yaml | 20 +++++++++++- .../integrate-isolated-handwritten-code.yaml | 31 ++++++++++++++----- .../logging-integration.yaml | 18 +++++++++++ .../pubsub-integration.yaml | 16 ++++++++++ packages/db-dtypes/noxfile.py | 11 +++++-- packages/google-api-core/noxfile.py | 7 ++++- packages/google-auth-httplib2/noxfile.py | 9 ++++-- packages/google-cloud-core/noxfile.py | 11 +++++-- packages/google-cloud-dns/noxfile.py | 9 ++++-- .../noxfile.py | 9 ++++-- .../google-cloud-error-reporting/noxfile.py | 9 ++++-- packages/google-cloud-firestore/noxfile.py | 9 ++++-- packages/google-cloud-logging/noxfile.py | 9 ++++-- packages/google-cloud-pubsub/noxfile.py | 9 ++++-- .../google-cloud-runtimeconfig/noxfile.py | 9 ++++-- packages/google-cloud-testutils/noxfile.py | 11 +++++-- packages/proto-plus/noxfile.py | 11 +++++-- 17 files changed, 171 insertions(+), 37 deletions(-) diff --git a/.librarian/generator-input/client-post-processing/firestore-integration.yaml b/.librarian/generator-input/client-post-processing/firestore-integration.yaml index 50defa6a4829..012a3802c77c 100644 --- a/.librarian/generator-input/client-post-processing/firestore-integration.yaml +++ b/.librarian/generator-input/client-post-processing/firestore-integration.yaml @@ -647,6 +647,24 @@ replacements: "pytest-xdist", ] count: 1 + - paths: [ + packages/google-cloud-firestore/noxfile.py + ] + before: 'RUFF_VERSION = "ruff==0\.14\.14"' + after: | + RUFF_VERSION = "ruff==0.14.14" + # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error + # before pytest_configure hooks run, turning pytest-asyncio's unset + # asyncio_default_fixture_loop_scope warning into an error. Remove once + # pytest 9.2+ warning and fixture scope deprecations are resolved. + PYTEST_VERSION = "pytest<9.2" + count: 1 + - paths: [ + packages/google-cloud-firestore/noxfile.py + ] + before: '"pytest",' + after: 'PYTEST_VERSION,' + count: 2 - paths: [ packages/google-cloud-firestore/noxfile.py ] @@ -797,4 +815,4 @@ replacements: Code samples and snippets live in the `python-docs-samples`_ repo. .. _`python-docs-samples`: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/firestore - count: 1 \ No newline at end of file + count: 1 diff --git a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index c200d3069dbf..e0f722319489 100644 --- a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml +++ b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml @@ -43,7 +43,7 @@ replacements: packages/google-cloud-vision/google/cloud/vision_v1p2beta1/__init__.py, packages/google-cloud-vision/google/cloud/vision_v1p3beta1/__init__.py, packages/google-cloud-vision/google/cloud/vision_v1p4beta1/__init__.py, - ] + ] before: | from .types.web_detection import WebDetection\n __all__ = \( @@ -93,7 +93,7 @@ replacements: translate_v2/services_ translate_v2/types_ - + API Reference ------------- .. toctree:: @@ -129,7 +129,7 @@ replacements: - paths: [ packages/google-cloud-speech/google/cloud/speech_v1/__init__.py, packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py, - ] + ] before: | \) @@ -150,7 +150,7 @@ replacements: count: 2 - paths: [ packages/google-cloud-speech/google/cloud/speech/__init__.py, - ] + ] before: | from google.cloud.speech_v1.services.speech.client import SpeechClient after: | @@ -354,7 +354,7 @@ replacements: :maxdepth: 2 usage - + API Reference ------------- @@ -369,7 +369,7 @@ replacements: Changelog - count: 1 + count: 1 - paths: [ "packages/google-cloud-bigquery-storage/noxfile.py", ] @@ -388,6 +388,24 @@ replacements: before: '\n "--check-untyped-defs",' after: '\n # TODO(https://github.com/googleapis/google-cloud-python/issues/16083)\n # "--check-untyped-defs",' count: 1 + - paths: [ + "packages/google-cloud-error-reporting/noxfile.py", + ] + before: 'RUFF_VERSION = "ruff==0\.14\.14"' + after: | + RUFF_VERSION = "ruff==0.14.14" + # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error + # before pytest_configure hooks run, turning pytest-asyncio's unset + # asyncio_default_fixture_loop_scope warning into an error. Remove once + # pytest 9.2+ warning and fixture scope deprecations are resolved. + PYTEST_VERSION = "pytest<9.2" + count: 1 + - paths: [ + "packages/google-cloud-error-reporting/noxfile.py", + ] + before: '"pytest",' + after: 'PYTEST_VERSION,' + count: 2 - paths: [ "packages/google-cloud-monitoring-dashboards/noxfile.py", ] @@ -453,4 +471,3 @@ replacements: google-cloud-logging>=3 grpcio>=1 count: 2 - diff --git a/.librarian/generator-input/client-post-processing/logging-integration.yaml b/.librarian/generator-input/client-post-processing/logging-integration.yaml index 9db37f582424..45be0d6e7790 100644 --- a/.librarian/generator-input/client-post-processing/logging-integration.yaml +++ b/.librarian/generator-input/client-post-processing/logging-integration.yaml @@ -452,6 +452,24 @@ replacements: "types", ) count: 1 + - paths: [ + packages/google-cloud-logging/noxfile.py + ] + before: 'RUFF_VERSION = "ruff==0\.14\.14"' + after: | + RUFF_VERSION = "ruff==0.14.14" + # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error + # before pytest_configure hooks run, turning pytest-asyncio's unset + # asyncio_default_fixture_loop_scope warning into an error. Remove once + # pytest 9.2+ warning and fixture scope deprecations are resolved. + PYTEST_VERSION = "pytest<9.2" + count: 1 + - paths: [ + packages/google-cloud-logging/noxfile.py + ] + before: '"pytest",' + after: 'PYTEST_VERSION,' + count: 2 - paths: [ packages/google-cloud-logging/noxfile.py ] diff --git a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml index 238f99e447df..e854d4d5109a 100644 --- a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml +++ b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml @@ -501,6 +501,22 @@ replacements: """Skipping until Pub/Sub migration is complete.""" session.skip("Skipping core_deps_from_source for google-cloud-pubsub.") count: 1 + - paths: + - "packages/google-cloud-pubsub/noxfile.py" + before: 'RUFF_VERSION = "ruff==0\.14\.14"' + after: |- + RUFF_VERSION = "ruff==0.14.14" + # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error + # before pytest_configure hooks run, turning pytest-asyncio's unset + # asyncio_default_fixture_loop_scope warning into an error. Remove once + # pytest 9.2+ warning and fixture scope deprecations are resolved. + PYTEST_VERSION = "pytest<9.2" + count: 1 + - paths: + - "packages/google-cloud-pubsub/noxfile.py" + before: '"pytest",' + after: 'PYTEST_VERSION,' + count: 2 - paths: - "packages/google-cloud-pubsub/noxfile.py" before: '"--cov=google",' diff --git a/packages/db-dtypes/noxfile.py b/packages/db-dtypes/noxfile.py index 5b0e797f881f..fca37e128fea 100644 --- a/packages/db-dtypes/noxfile.py +++ b/packages/db-dtypes/noxfile.py @@ -31,6 +31,11 @@ BLACK_VERSION = "black[jupyter]==23.7.0" RUFF_VERSION = "ruff==0.14.14" ISORT_VERSION = "isort==5.11.0" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "db_dtypes", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.14" @@ -48,7 +53,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -61,7 +66,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] @@ -262,7 +267,7 @@ def prerelease(session, tests_path): session.install( "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", # tzdata is only needed for testing: pandas 3.0+ no longer installs diff --git a/packages/google-api-core/noxfile.py b/packages/google-api-core/noxfile.py index 584ec1ca63de..cc934e4b66ca 100644 --- a/packages/google-api-core/noxfile.py +++ b/packages/google-api-core/noxfile.py @@ -29,6 +29,11 @@ import nox RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] ALL_PYTHON = ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"] @@ -220,7 +225,7 @@ def default( unittest.skip("The pre-release session cannot be run without grpc") session.install( - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-mock", "pytest-xdist", diff --git a/packages/google-auth-httplib2/noxfile.py b/packages/google-auth-httplib2/noxfile.py index fd45282ed298..68fe2f40313c 100644 --- a/packages/google-auth-httplib2/noxfile.py +++ b/packages/google-auth-httplib2/noxfile.py @@ -29,6 +29,11 @@ BLACK_VERSION = "black[jupyter]==23.7.0" RUFF_VERSION = "ruff==0.14.14" ISORT_VERSION = "isort==5.11.0" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google_auth_httplib2.py", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.14" @@ -44,7 +49,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -60,7 +65,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.10"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-core/noxfile.py b/packages/google-cloud-core/noxfile.py index dbff5c4737c6..2221c42d66f9 100644 --- a/packages/google-cloud-core/noxfile.py +++ b/packages/google-cloud-core/noxfile.py @@ -23,6 +23,11 @@ BLACK_VERSION = "black==23.7.0" RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning (inherited via shared CI venvs) +# into an error. Remove once pytest 9.2+ deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.14" @@ -136,7 +141,7 @@ def default(session): ) # Install all test dependencies, then install local packages in-place. - session.install("pytest<9.2", "pytest-cov", "-c", constraints_path) + session.install(PYTEST_VERSION, "pytest-cov", "-c", constraints_path) session.install("-e", ".[grpc]", "-c", constraints_path) # Run py.test against the unit tests. @@ -275,7 +280,7 @@ def prerelease_deps(session, protobuf_implementation): """Run all tests with prerelease versions of dependencies installed.""" # Install all test dependencies, then install local packages in-place. - session.install("pytest<9.2", "pytest-cov") + session.install(PYTEST_VERSION, "pytest-cov") session.install("-e", ".[grpc]") # Because we test minimum dependency versions on the minimum Python @@ -362,7 +367,7 @@ def core_deps_from_source(session, protobuf_implementation): """ # Install all test dependencies, then install local packages in-place. - session.install("pytest<9.2", "pytest-cov") + session.install(PYTEST_VERSION, "pytest-cov") session.install("-e", ".[grpc]") # Because we test minimum dependency versions on the minimum Python diff --git a/packages/google-cloud-dns/noxfile.py b/packages/google-cloud-dns/noxfile.py index 45cf5c6865f8..5f659a148194 100644 --- a/packages/google-cloud-dns/noxfile.py +++ b/packages/google-cloud-dns/noxfile.py @@ -31,6 +31,11 @@ BLACK_VERSION = "black[jupyter]==23.7.0" RUFF_VERSION = "ruff==0.14.14" ISORT_VERSION = "isort==5.11.0" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.14" @@ -46,7 +51,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -58,7 +63,7 @@ SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-documentai-toolbox/noxfile.py b/packages/google-cloud-documentai-toolbox/noxfile.py index 3d7cc9a93ca4..c1d2ab53dde8 100644 --- a/packages/google-cloud-documentai-toolbox/noxfile.py +++ b/packages/google-cloud-documentai-toolbox/noxfile.py @@ -31,6 +31,11 @@ BLACK_VERSION = "black[jupyter]==23.7.0" RUFF_VERSION = "ruff==0.14.14" ISORT_VERSION = "isort==5.11.0" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.14" @@ -47,7 +52,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -60,7 +65,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-error-reporting/noxfile.py b/packages/google-cloud-error-reporting/noxfile.py index 976817405aac..5cc4d0f63ee5 100644 --- a/packages/google-cloud-error-reporting/noxfile.py +++ b/packages/google-cloud-error-reporting/noxfile.py @@ -23,6 +23,11 @@ import nox RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -66,7 +71,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -79,7 +84,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-firestore/noxfile.py b/packages/google-cloud-firestore/noxfile.py index 9b32e589f557..9391ad33853d 100644 --- a/packages/google-cloud-firestore/noxfile.py +++ b/packages/google-cloud-firestore/noxfile.py @@ -23,6 +23,11 @@ import nox RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -66,7 +71,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio==0.21.2", ] @@ -83,7 +88,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest<9.2", + PYTEST_VERSION, ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [ "pytest-asyncio==0.21.2", diff --git a/packages/google-cloud-logging/noxfile.py b/packages/google-cloud-logging/noxfile.py index 6720bf25dcf7..13cc30695b6c 100644 --- a/packages/google-cloud-logging/noxfile.py +++ b/packages/google-cloud-logging/noxfile.py @@ -23,6 +23,11 @@ import nox RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -66,7 +71,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -83,7 +88,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [ diff --git a/packages/google-cloud-pubsub/noxfile.py b/packages/google-cloud-pubsub/noxfile.py index 6b6f12108191..7d3dde3e27d8 100644 --- a/packages/google-cloud-pubsub/noxfile.py +++ b/packages/google-cloud-pubsub/noxfile.py @@ -23,6 +23,11 @@ import nox RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -66,7 +71,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -81,7 +86,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON SYSTEM_TEST_STANDARD_DEPENDENCIES = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [ diff --git a/packages/google-cloud-runtimeconfig/noxfile.py b/packages/google-cloud-runtimeconfig/noxfile.py index c622ef48889f..b34f7bf306b5 100644 --- a/packages/google-cloud-runtimeconfig/noxfile.py +++ b/packages/google-cloud-runtimeconfig/noxfile.py @@ -31,6 +31,11 @@ BLACK_VERSION = "black[jupyter]==23.7.0" RUFF_VERSION = "ruff==0.14.14" ISORT_VERSION = "isort==5.11.0" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning into an error. Remove once +# pytest 9.2+ warning and fixture scope deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.14" @@ -46,7 +51,7 @@ UNIT_TEST_STANDARD_DEPENDENCIES = [ "mock", "asyncmock", - "pytest<9.2", + PYTEST_VERSION, "pytest-cov", "pytest-asyncio", ] @@ -59,7 +64,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", - "pytest<9.2", + PYTEST_VERSION, "google-cloud-testutils", ] SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [] diff --git a/packages/google-cloud-testutils/noxfile.py b/packages/google-cloud-testutils/noxfile.py index a94c166b3cc1..4b07c13bbeb2 100644 --- a/packages/google-cloud-testutils/noxfile.py +++ b/packages/google-cloud-testutils/noxfile.py @@ -38,6 +38,11 @@ DEFAULT_PYTHON_VERSION = "3.14" BLACK_VERSION = "black==23.7.0" RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning (inherited via shared CI venvs) +# into an error. Remove once pytest 9.2+ deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" BLACK_PATHS = ["test_utils", "setup.py"] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() # Path to the centralized mypy configuration file at the repository root. @@ -155,7 +160,7 @@ def unit(session): "-e", "tests/unit/resources/good_package", "tests/unit/resources/bad_package" ) - session.install("pytest<9.2", "pytest-cov") + session.install(PYTEST_VERSION, "pytest-cov") session.install("-e", ".", "-c", constraints_path) # Run py.test against the unit tests. @@ -304,7 +309,7 @@ def prerelease_deps(session): "-e", "tests/unit/resources/good_package", "tests/unit/resources/bad_package" ) - session.install("pytest<9.2", "pytest-cov") + session.install(PYTEST_VERSION, "pytest-cov") session.install("-e", ".", "-c", constraints_path) # Because we test minimum dependency versions on the minimum Python @@ -372,7 +377,7 @@ def core_deps_from_source(session): "-e", "tests/unit/resources/good_package", "tests/unit/resources/bad_package" ) - session.install("pytest<9.2", "pytest-cov") + session.install(PYTEST_VERSION, "pytest-cov") session.install("-e", ".", "-c", constraints_path) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/proto-plus/noxfile.py b/packages/proto-plus/noxfile.py index 83181bbdd0d5..4b4ba40a7e10 100644 --- a/packages/proto-plus/noxfile.py +++ b/packages/proto-plus/noxfile.py @@ -23,6 +23,11 @@ BLACK_VERSION = "black[jupyter]==23.7.0" ISORT_VERSION = "isort==5.11.0" RUFF_VERSION = "ruff==0.14.14" +# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error +# before pytest_configure hooks run, turning pytest-asyncio's unset +# asyncio_default_fixture_loop_scope warning (inherited via shared CI venvs) +# into an error. Remove once pytest 9.2+ deprecations are resolved. +PYTEST_VERSION = "pytest<9.2" LINT_PATHS = ["docs", "proto", "tests", "noxfile.py", "setup.py"] @@ -64,7 +69,7 @@ def unit(session, implementation): ) session.env["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = implementation - session.install("coverage", "pytest<9.2", "pytest-cov", "pytz") + session.install("coverage", PYTEST_VERSION, "pytest-cov", "pytz") session.install("-e", ".[testing]", "-c", constraints_path) # TODO(https://github.com/googleapis/proto-plus-python/issues/403): re-enable `-W=error` @@ -100,7 +105,7 @@ def prerelease_deps(session, implementation): session.env["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = implementation # Install test environment dependencies - session.install("coverage", "pytest<9.2", "pytest-cov", "pytz") + session.install("coverage", PYTEST_VERSION, "pytest-cov", "pytz") # Install the package without dependencies session.install("-e", ".", "--no-deps") @@ -157,7 +162,7 @@ def core_deps_from_source(session, implementation): session.env["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = implementation # Install test environment dependencies - session.install("coverage", "pytest<9.2", "pytest-cov", "pytz") + session.install("coverage", PYTEST_VERSION, "pytest-cov", "pytz") # Install the package without dependencies session.install("-e", ".", "--no-deps") From 98b0aeb9cd11618bebb4c389fdff098faef04a9b Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Wed, 28 Oct 2026 13:18:42 -0400 Subject: [PATCH 3/5] fix: make PYTEST_VERSION post-processing regexes idempotent across multiple owlbot passes --- .../client-post-processing/firestore-integration.yaml | 4 +++- .../integrate-isolated-handwritten-code.yaml | 4 +++- .../client-post-processing/logging-integration.yaml | 4 +++- .../client-post-processing/pubsub-integration.yaml | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.librarian/generator-input/client-post-processing/firestore-integration.yaml b/.librarian/generator-input/client-post-processing/firestore-integration.yaml index 012a3802c77c..f53294c34971 100644 --- a/.librarian/generator-input/client-post-processing/firestore-integration.yaml +++ b/.librarian/generator-input/client-post-processing/firestore-integration.yaml @@ -650,7 +650,7 @@ replacements: - paths: [ packages/google-cloud-firestore/noxfile.py ] - before: 'RUFF_VERSION = "ruff==0\.14\.14"' + before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS =' after: | RUFF_VERSION = "ruff==0.14.14" # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error @@ -658,6 +658,8 @@ replacements: # asyncio_default_fixture_loop_scope warning into an error. Remove once # pytest 9.2+ warning and fixture scope deprecations are resolved. PYTEST_VERSION = "pytest<9.2" + + LINT_PATHS = count: 1 - paths: [ packages/google-cloud-firestore/noxfile.py diff --git a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index e0f722319489..1c1396ac9586 100644 --- a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml +++ b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml @@ -391,7 +391,7 @@ replacements: - paths: [ "packages/google-cloud-error-reporting/noxfile.py", ] - before: 'RUFF_VERSION = "ruff==0\.14\.14"' + before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS =' after: | RUFF_VERSION = "ruff==0.14.14" # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error @@ -399,6 +399,8 @@ replacements: # asyncio_default_fixture_loop_scope warning into an error. Remove once # pytest 9.2+ warning and fixture scope deprecations are resolved. PYTEST_VERSION = "pytest<9.2" + + LINT_PATHS = count: 1 - paths: [ "packages/google-cloud-error-reporting/noxfile.py", diff --git a/.librarian/generator-input/client-post-processing/logging-integration.yaml b/.librarian/generator-input/client-post-processing/logging-integration.yaml index 45be0d6e7790..2d7f26acb572 100644 --- a/.librarian/generator-input/client-post-processing/logging-integration.yaml +++ b/.librarian/generator-input/client-post-processing/logging-integration.yaml @@ -455,7 +455,7 @@ replacements: - paths: [ packages/google-cloud-logging/noxfile.py ] - before: 'RUFF_VERSION = "ruff==0\.14\.14"' + before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS =' after: | RUFF_VERSION = "ruff==0.14.14" # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error @@ -463,6 +463,8 @@ replacements: # asyncio_default_fixture_loop_scope warning into an error. Remove once # pytest 9.2+ warning and fixture scope deprecations are resolved. PYTEST_VERSION = "pytest<9.2" + + LINT_PATHS = count: 1 - paths: [ packages/google-cloud-logging/noxfile.py diff --git a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml index e854d4d5109a..6cdee52bb96d 100644 --- a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml +++ b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml @@ -503,7 +503,7 @@ replacements: count: 1 - paths: - "packages/google-cloud-pubsub/noxfile.py" - before: 'RUFF_VERSION = "ruff==0\.14\.14"' + before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS =' after: |- RUFF_VERSION = "ruff==0.14.14" # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error @@ -511,6 +511,8 @@ replacements: # asyncio_default_fixture_loop_scope warning into an error. Remove once # pytest 9.2+ warning and fixture scope deprecations are resolved. PYTEST_VERSION = "pytest<9.2" + + LINT_PATHS = count: 1 - paths: - "packages/google-cloud-pubsub/noxfile.py" From 80a171d16a97a22a5acbea2cbc3de10a3739f00b Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Wed, 28 Oct 2026 13:48:05 -0400 Subject: [PATCH 4/5] fix: use chomped block scalar (|-) in post-processing YAML rules --- .../client-post-processing/firestore-integration.yaml | 2 +- .../integrate-isolated-handwritten-code.yaml | 2 +- .../client-post-processing/logging-integration.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.librarian/generator-input/client-post-processing/firestore-integration.yaml b/.librarian/generator-input/client-post-processing/firestore-integration.yaml index f53294c34971..baf7aeb0141e 100644 --- a/.librarian/generator-input/client-post-processing/firestore-integration.yaml +++ b/.librarian/generator-input/client-post-processing/firestore-integration.yaml @@ -651,7 +651,7 @@ replacements: packages/google-cloud-firestore/noxfile.py ] before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS =' - after: | + after: |- RUFF_VERSION = "ruff==0.14.14" # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error # before pytest_configure hooks run, turning pytest-asyncio's unset diff --git a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index 1c1396ac9586..71666e634724 100644 --- a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml +++ b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml @@ -392,7 +392,7 @@ replacements: "packages/google-cloud-error-reporting/noxfile.py", ] before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS =' - after: | + after: |- RUFF_VERSION = "ruff==0.14.14" # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error # before pytest_configure hooks run, turning pytest-asyncio's unset diff --git a/.librarian/generator-input/client-post-processing/logging-integration.yaml b/.librarian/generator-input/client-post-processing/logging-integration.yaml index 2d7f26acb572..f1f2d15c9e9e 100644 --- a/.librarian/generator-input/client-post-processing/logging-integration.yaml +++ b/.librarian/generator-input/client-post-processing/logging-integration.yaml @@ -456,7 +456,7 @@ replacements: packages/google-cloud-logging/noxfile.py ] before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS =' - after: | + after: |- RUFF_VERSION = "ruff==0.14.14" # Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error # before pytest_configure hooks run, turning pytest-asyncio's unset From f3e5799ac77a4d66bf05d1a380cbda2f12a3917c Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Wed, 28 Oct 2026 14:08:03 -0400 Subject: [PATCH 5/5] fix: preserve original whitespace in integrate-isolated-handwritten-code.yaml --- .../firestore-integration.yaml | 2 +- .../integrate-isolated-handwritten-code.yaml | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.librarian/generator-input/client-post-processing/firestore-integration.yaml b/.librarian/generator-input/client-post-processing/firestore-integration.yaml index baf7aeb0141e..d31022a3b362 100644 --- a/.librarian/generator-input/client-post-processing/firestore-integration.yaml +++ b/.librarian/generator-input/client-post-processing/firestore-integration.yaml @@ -817,4 +817,4 @@ replacements: Code samples and snippets live in the `python-docs-samples`_ repo. .. _`python-docs-samples`: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/firestore - count: 1 + count: 1 \ No newline at end of file diff --git a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index 71666e634724..1c686e8d7269 100644 --- a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml +++ b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml @@ -43,7 +43,7 @@ replacements: packages/google-cloud-vision/google/cloud/vision_v1p2beta1/__init__.py, packages/google-cloud-vision/google/cloud/vision_v1p3beta1/__init__.py, packages/google-cloud-vision/google/cloud/vision_v1p4beta1/__init__.py, - ] + ] before: | from .types.web_detection import WebDetection\n __all__ = \( @@ -93,7 +93,7 @@ replacements: translate_v2/services_ translate_v2/types_ - + API Reference ------------- .. toctree:: @@ -129,7 +129,7 @@ replacements: - paths: [ packages/google-cloud-speech/google/cloud/speech_v1/__init__.py, packages/google-cloud-speech/google/cloud/speech_v1p1beta1/__init__.py, - ] + ] before: | \) @@ -150,7 +150,7 @@ replacements: count: 2 - paths: [ packages/google-cloud-speech/google/cloud/speech/__init__.py, - ] + ] before: | from google.cloud.speech_v1.services.speech.client import SpeechClient after: | @@ -354,7 +354,7 @@ replacements: :maxdepth: 2 usage - + API Reference ------------- @@ -369,7 +369,7 @@ replacements: Changelog - count: 1 + count: 1 - paths: [ "packages/google-cloud-bigquery-storage/noxfile.py", ] @@ -473,3 +473,4 @@ replacements: google-cloud-logging>=3 grpcio>=1 count: 2 +