FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: resolve issue with pubsub generation (#17219) · googleapis/google-cloud-python@b21c1d4 · GitHub

/ google-cloud-python Public

Commit b21c1d4

Browse files
chalmerlowe
authored
fix: resolve issue with pubsub generation (#17219)
Corrects issue with package generation. ### Changes #### librarian.yaml: * Enabled client library generation for `google-cloud-pubsub` by removing `skip_generate`. #### .librarian/generator-input/client-post-processing/pubsub-integration.yaml: * Removed obsolete `grpcio-status` post-processing rules that are no longer necessary. * Added a unified post-processing rule to correctly split an unintentionally merged/concatenated `grpcio` dependency constraint back into two separate, version-constrained lines for use in `setup.py`. #### packages/google-cloud-pubsub/pytest.ini: * Added a selective warning ignore rule `(ignore:.*SelectableGroups dict interface is deprecated:DeprecationWarning)` to prevent `pytest` from failing on third-party dependency deprecation warnings under Python 3.11+. #### packages/google-cloud-pubsub/README.rst & packages/google-cloud-pubsub/docs/README.rst: * `README` files updated due to changes in synthtool template now reflect the dropped support for Python 3.9 (minimum version bounds bumped from >= 3.9 to >= 3.10).
1 parent 89d6913 commit b21c1d4

6 files changed

Lines changed: 15 additions & 18 deletions

File tree

‎.librarian/generator-input/client-post-processing/pubsub-integration.yaml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -369,14 +369,6 @@ replacements:
369369
count: 1
370370

371371

372-
# --- FIX: Restore pubsub-specific grpcio bound ---
373-
- paths:
374-
- "packages/google-cloud-pubsub/setup.py"
375-
before: '([ \t]+)"grpcio >= [0-9\.]+, < 2\.0\.0",\n'
376-
after: |-
377-
\g<1>"grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'", # https://github.com/googleapis/python-pubsub/issues/609
378-
count: 1
379-
380372
# --- FIX: Restore missing dependencies, extras, and url dynamically ---
381373
- paths:
382374
- "packages/google-cloud-pubsub/setup.py"
@@ -530,8 +522,8 @@ replacements:
530522

531523
- paths:
532524
- "packages/google-cloud-pubsub/setup.py"
533-
before: '"grpcio-status >= 1\.44\.0",'
534-
after: '"grpcio-status >= 1.51.3",'
525+
before: '([ \t]+)"grpcio >= [0-9\.]+, < 2\.0\.0",\n(?:[ \t]*)"grpcio >= 1\.75\.1, < 2\.0\.0; python_version >= ''3\.14''",\n'
526+
after: |-
527+
\g<1>"grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'",
528+
\g<1>"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
535529
count: 1
536-
537-

‎librarian.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,6 @@ libraries:
16591659
version: 2.38.0
16601660
apis:
16611661
- path: google/pubsub/v1
1662-
skip_generate: true
16631662
python:
16641663
library_type: GAPIC_COMBO
16651664
opt_args_by_api:

‎packages/google-cloud-pubsub/README.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,15 @@ Supported Python Versions
6262
Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
6363
Python.
6464

65-
Python >= 3.9, including 3.14
65+
Python >= 3.10, including 3.14
6666

6767
.. _active: https://devguide.python.org/devcycle/#in-development-main-branch
6868
.. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches
6969

7070
Unsupported Python Versions
7171
^^^^^^^^^^^^^^^^^^^^^^^^^^^
72-
Python <= 3.8
72+
Python <= 3.9
73+
7374

7475
If you are using an `end-of-life`_
7576
version of Python, we recommend that you update as soon as possible to an actively supported version.

‎packages/google-cloud-pubsub/docs/README.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,15 @@ Supported Python Versions
6262
Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
6363
Python.
6464

65-
Python >= 3.9, including 3.14
65+
Python >= 3.10, including 3.14
6666

6767
.. _active: https://devguide.python.org/devcycle/#in-development-main-branch
6868
.. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches
6969

7070
Unsupported Python Versions
7171
^^^^^^^^^^^^^^^^^^^^^^^^^^^
72-
Python <= 3.8
72+
Python <= 3.9
73+
7374

7475
If you are using an `end-of-life`_
7576
version of Python, we recommend that you update as soon as possible to an actively supported version.

‎packages/google-cloud-pubsub/pytest.ini‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ filterwarnings =
2626
ignore:You are using a non-supported Python version \(([\d\.]+)\)\. Google will not post any further updates to google\.api_core.*:FutureWarning
2727
# These google library EOL warnings for Python versions don't matter for the purposes of a test.
2828
ignore::FutureWarning:google.*:
29+
# Suppress SelectableGroups deprecation warning from older dependencies under Python 3.11+
30+
ignore:.*SelectableGroups dict interface is deprecated:DeprecationWarning
31+

‎packages/google-cloud-pubsub/setup.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
# Exclude incompatible versions of `google-auth`
4444
# See https://github.com/googleapis/google-cloud-python/issues/12364
4545
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
46-
"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'",
46+
"grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'",
47+
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
4748
"proto-plus >= 1.22.3, <2.0.0",
4849
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
4950
"protobuf >= 4.25.8, < 8.0.0",

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL