From 9eaa43a8366c1d2e14d76180e13a4e2caca7e307 Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:29:18 -0400 Subject: [PATCH 01/10] fix: bump system test python versions in owlbot config --- owlbot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/owlbot.py b/owlbot.py index 2a131d557..47d6dca71 100644 --- a/owlbot.py +++ b/owlbot.py @@ -340,8 +340,8 @@ versions=gcp.common.detect_versions(path="./google", default_first=True), unit_test_python_versions=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"], unit_test_dependencies=["flaky"], - system_test_python_versions=["3.12"], - system_test_external_dependencies=["psutil","flaky"], + system_test_python_versions=["3.13"], + system_test_external_dependencies=["psutil", "flaky"], ) s.move(templated_files, excludes=[".coveragerc", ".github/blunderbuss.yml", ".github/release-please.yml", "README.rst", "docs/index.rst"]) From 89db9060941d7802817eaa072385220d6fde1c23 Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:33:37 -0400 Subject: [PATCH 02/10] fix resolve system test issue --- CONTRIBUTING.rst | 4 ++-- noxfile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index f153c3ae7..9e00ac9bf 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -143,12 +143,12 @@ Running System Tests $ nox -s system # Run a single system test - $ nox -s system-3.12 -- -k + $ nox -s system-3.13 -- -k .. note:: - System tests are only configured to run under Python 3.12. + System tests are only configured to run under Python 3.13. For expediency, we do not run them in older versions of Python 3. This alone will not run the tests. You'll need to change some local diff --git a/noxfile.py b/noxfile.py index 70e65a571..bbb0161cc 100644 --- a/noxfile.py +++ b/noxfile.py @@ -60,7 +60,7 @@ UNIT_TEST_EXTRAS: List[str] = [] UNIT_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {} -SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"] +SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.13"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", "pytest", From 1b8f7f3bcae4d671f79179ec1d1598ce8d73c646 Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:44:26 -0400 Subject: [PATCH 03/10] Update noxfile.py --- samples/snippets/noxfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index c9a3d1ecb..262cd8663 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -32,6 +32,8 @@ BLACK_VERSION = "black==22.3.0" ISORT_VERSION = "isort==5.10.1" +DEFAULT_PYTHON_VERSION = "3.13" + # Copy `noxfile_config.py` to your directory and modify it instead. # `TEST_CONFIG` dict is a configuration hook that allows users to @@ -147,7 +149,7 @@ def lint(session: nox.sessions.Session) -> None: # -@nox.session +@nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session: nox.sessions.Session) -> None: """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) From bd926f7f93b846fda83759e2e0c2469cf6620507 Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:52:24 -0400 Subject: [PATCH 04/10] Update noxfile.py --- samples/snippets/noxfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 262cd8663..c9a3d1ecb 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -32,8 +32,6 @@ BLACK_VERSION = "black==22.3.0" ISORT_VERSION = "isort==5.10.1" -DEFAULT_PYTHON_VERSION = "3.13" - # Copy `noxfile_config.py` to your directory and modify it instead. # `TEST_CONFIG` dict is a configuration hook that allows users to @@ -149,7 +147,7 @@ def lint(session: nox.sessions.Session) -> None: # -@nox.session(python=DEFAULT_PYTHON_VERSION) +@nox.session def blacken(session: nox.sessions.Session) -> None: """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) From 1d80d6772f52ec61f8c6d5137876ff718d221eea Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:54:27 -0400 Subject: [PATCH 05/10] try pinning py3.12 in blacken --- noxfile.py | 2 +- samples/snippets/noxfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index bbb0161cc..d2eda076c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -161,7 +161,7 @@ def lint(session): session.run("flake8", "google", "tests") -@nox.session(python=DEFAULT_PYTHON_VERSION) +@nox.session(python="3.12") def blacken(session): """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index c9a3d1ecb..2d97f49fc 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -147,7 +147,7 @@ def lint(session: nox.sessions.Session) -> None: # -@nox.session +@nox.session(python="3.12") def blacken(session: nox.sessions.Session) -> None: """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) From 12b351c8e56d74fca3817ac163be8fe2d54aad6d Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:57:32 -0400 Subject: [PATCH 06/10] use py3.10 for blacken --- noxfile.py | 2 +- samples/snippets/noxfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index d2eda076c..37ec4384c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -161,7 +161,7 @@ def lint(session): session.run("flake8", "google", "tests") -@nox.session(python="3.12") +@nox.session(python="3.10") def blacken(session): """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 2d97f49fc..71fd05afa 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -147,7 +147,7 @@ def lint(session: nox.sessions.Session) -> None: # -@nox.session(python="3.12") +@nox.session(python="3.10") def blacken(session: nox.sessions.Session) -> None: """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) From 59885190ddf57371e14f662c30e2455937de00e7 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 6 Oct 2025 23:59:38 +0000 Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .github/workflows/docs.yml | 8 ++++---- .github/workflows/lint.yml | 6 +++--- samples/snippets/noxfile.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0d0fdb861..2833fe98f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install nox @@ -24,9 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install nox diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 46a3ff38f..4866193af 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v5 with: - python-version: "3.13" + python-version: "3.8" - name: Install nox run: | python -m pip install --upgrade setuptools pip wheel diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 71fd05afa..c9a3d1ecb 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -147,7 +147,7 @@ def lint(session: nox.sessions.Session) -> None: # -@nox.session(python="3.10") +@nox.session def blacken(session: nox.sessions.Session) -> None: """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) From a4ba97f86caafd305255a1bffcd330045a8daa0b Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 20:01:27 -0400 Subject: [PATCH 08/10] ignore files that are incorrectly changed --- owlbot.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/owlbot.py b/owlbot.py index 47d6dca71..e90039090 100644 --- a/owlbot.py +++ b/owlbot.py @@ -343,7 +343,18 @@ system_test_python_versions=["3.13"], system_test_external_dependencies=["psutil", "flaky"], ) -s.move(templated_files, excludes=[".coveragerc", ".github/blunderbuss.yml", ".github/release-please.yml", "README.rst", "docs/index.rst"]) +s.move( + templated_files, + excludes=[ + ".coveragerc", + ".github/blunderbuss.yml", + ".github/release-please.yml", + "README.rst", + "docs/index.rst" ".github/workflows/docs.yml", + ".github/workflows/lint.yml", + "samples/snippets/noxfile.py", + ], +) python.py_samples(skip_readmes=True) From add9c7742f3cff539400801088ab8d54aeadb044 Mon Sep 17 00:00:00 2001 From: abbrowne126 <81702808+abbrowne126@users.noreply.github.com> Date: Mon, 6 Oct 2025 20:03:15 -0400 Subject: [PATCH 09/10] remove owlbot changes --- .github/workflows/docs.yml | 8 ++++---- .github/workflows/lint.yml | 6 +++--- samples/snippets/noxfile.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2833fe98f..0d0fdb861 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" - name: Install nox @@ -24,9 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" - name: Install nox diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4866193af..46a3ff38f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: - python-version: "3.8" + python-version: "3.13" - name: Install nox run: | python -m pip install --upgrade setuptools pip wheel diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index c9a3d1ecb..71fd05afa 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -147,7 +147,7 @@ def lint(session: nox.sessions.Session) -> None: # -@nox.session +@nox.session(python="3.10") def blacken(session: nox.sessions.Session) -> None: """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) From ef1b598834f637d78b6d4a187be2107e39c52f40 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 7 Oct 2025 00:05:37 +0000 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .github/workflows/docs.yml | 8 ++++---- docs/index.rst | 27 +++++++++------------------ samples/snippets/noxfile.py | 2 +- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0d0fdb861..2833fe98f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install nox @@ -24,9 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install nox diff --git a/docs/index.rst b/docs/index.rst index daba0c7b3..314e6de79 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,32 +3,24 @@ .. include:: multiprocessing.rst -API Documentation ------------------ - -.. note:: - - The client library version (currently ``2.x``) should not be confused with the - backend API version (currently ``v1``), hence some references to ``v1`` can be found - across the documentation. - +API Reference +------------- .. toctree:: - :maxdepth: 4 + :maxdepth: 2 - Publisher Client - Subscriber Client - Types + pubsub_v1/services_ + pubsub_v1/types_ Migration Guide --------------- -See the guide below for instructions on migrating to the 2.x release of this library. +See the guide below for instructions on migrating to the latest version. .. toctree:: :maxdepth: 2 - UPGRADING +  UPGRADING Changelog @@ -37,10 +29,9 @@ Changelog For a list of all ``google-cloud-pubsub`` releases: .. toctree:: - :maxdepth: 2 - - changelog + :maxdepth: 2 + changelog .. toctree:: :hidden: diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 71fd05afa..c9a3d1ecb 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -147,7 +147,7 @@ def lint(session: nox.sessions.Session) -> None: # -@nox.session(python="3.10") +@nox.session def blacken(session: nox.sessions.Session) -> None: """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION)