From efdecaf14e6772cfbf298986fd591607c1fb9af9 Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Thu, 21 May 2026 09:31:06 -0400 Subject: [PATCH 1/3] chore(pubsub): import optimized configuration for clean-room verification --- .../pubsub-integration.yaml | 16 ++++------------ librarian.yaml | 2 +- packages/google-cloud-pubsub/pytest.ini | 3 +++ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml index f91859f425ec..eedf4827e447 100644 --- a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml +++ b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml @@ -369,14 +369,6 @@ replacements: count: 1 - # --- FIX: Restore pubsub-specific grpcio bound --- - - paths: - - "packages/google-cloud-pubsub/setup.py" - before: '([ \t]+)"grpcio >= [0-9\.]+, < 2\.0\.0",\n' - after: |- - \g<1>"grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'", # https://github.com/googleapis/python-pubsub/issues/609 - count: 1 - # --- FIX: Restore missing dependencies, extras, and url dynamically --- - paths: - "packages/google-cloud-pubsub/setup.py" @@ -530,8 +522,8 @@ replacements: - paths: - "packages/google-cloud-pubsub/setup.py" - before: '"grpcio-status >= 1\.44\.0",' - after: '"grpcio-status >= 1.51.3",' + before: '([ \t]+)"grpcio >= [0-9\.]+, < 2\.0\.0",\n(?:[ \t]*)"grpcio >= 1\.75\.1, < 2\.0\.0; python_version >= ''3\.14''",\n' + after: |- + \g<1>"grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'", + \g<1>"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", count: 1 - - diff --git a/librarian.yaml b/librarian.yaml index 9a2d5f09fcd5..b18aa4634d56 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -1659,7 +1659,7 @@ libraries: version: 2.38.0 apis: - path: google/pubsub/v1 - skip_generate: true + skip_generate: false python: library_type: GAPIC_COMBO opt_args_by_api: diff --git a/packages/google-cloud-pubsub/pytest.ini b/packages/google-cloud-pubsub/pytest.ini index 41cad40d640b..af45389fdac8 100644 --- a/packages/google-cloud-pubsub/pytest.ini +++ b/packages/google-cloud-pubsub/pytest.ini @@ -26,3 +26,6 @@ filterwarnings = ignore:You are using a non-supported Python version \(([\d\.]+)\)\. Google will not post any further updates to google\.api_core.*:FutureWarning # These google library EOL warnings for Python versions don't matter for the purposes of a test. ignore::FutureWarning:google.*: + # Suppress SelectableGroups deprecation warning from older dependencies under Python 3.11+ + ignore:.*SelectableGroups dict interface is deprecated:DeprecationWarning + From aa887e5b5e2d2171eb3dcc4d1d7bc908a235a356 Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Thu, 21 May 2026 09:31:41 -0400 Subject: [PATCH 2/3] feat(pubsub): regenerate library cleanly from main using optimized post-processing configurations --- packages/google-cloud-pubsub/README.rst | 5 +++-- packages/google-cloud-pubsub/docs/README.rst | 5 +++-- packages/google-cloud-pubsub/setup.py | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/google-cloud-pubsub/README.rst b/packages/google-cloud-pubsub/README.rst index 46618a5f0417..7717a22044c4 100644 --- a/packages/google-cloud-pubsub/README.rst +++ b/packages/google-cloud-pubsub/README.rst @@ -62,14 +62,15 @@ Supported Python Versions Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of Python. -Python >= 3.9, including 3.14 +Python >= 3.10, including 3.14 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches Unsupported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Python <= 3.8 +Python <= 3.9 + If you are using an `end-of-life`_ version of Python, we recommend that you update as soon as possible to an actively supported version. diff --git a/packages/google-cloud-pubsub/docs/README.rst b/packages/google-cloud-pubsub/docs/README.rst index 46618a5f0417..7717a22044c4 100644 --- a/packages/google-cloud-pubsub/docs/README.rst +++ b/packages/google-cloud-pubsub/docs/README.rst @@ -62,14 +62,15 @@ Supported Python Versions Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of Python. -Python >= 3.9, including 3.14 +Python >= 3.10, including 3.14 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches Unsupported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Python <= 3.8 +Python <= 3.9 + If you are using an `end-of-life`_ version of Python, we recommend that you update as soon as possible to an actively supported version. diff --git a/packages/google-cloud-pubsub/setup.py b/packages/google-cloud-pubsub/setup.py index be01fa27e926..96a086c5c694 100644 --- a/packages/google-cloud-pubsub/setup.py +++ b/packages/google-cloud-pubsub/setup.py @@ -43,7 +43,8 @@ # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'", # https://github.com/googleapis/python-pubsub/issues/609 "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", + "grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'", + "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", "protobuf >= 4.25.8, < 8.0.0", From 8dd2a43af4e3d2d1afb9217e7186671ea0a7d918 Mon Sep 17 00:00:00 2001 From: Chalmer Lowe Date: Thu, 21 May 2026 10:21:31 -0400 Subject: [PATCH 3/3] Apply suggestion from @chalmerlowe --- librarian.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/librarian.yaml b/librarian.yaml index b18aa4634d56..ec25b6709e06 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -1659,7 +1659,6 @@ libraries: version: 2.38.0 apis: - path: google/pubsub/v1 - skip_generate: false python: library_type: GAPIC_COMBO opt_args_by_api: