From 8a61d535f033633c178f08556928ac29b78f3ffc Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Mon, 29 Sep 2025 14:21:18 +0000 Subject: [PATCH 1/4] feat: Add support for Python 3.14 --- .github/workflows/tests.yaml | 8 +++++++- gapic/ads-templates/noxfile.py.j2 | 4 ++++ gapic/ads-templates/setup.py.j2 | 1 + gapic/templates/noxfile.py.j2 | 5 ++++- gapic/templates/setup.py.j2 | 1 + noxfile.py | 2 +- setup.py | 1 + tests/integration/goldens/asset/noxfile.py | 5 ++++- tests/integration/goldens/asset/setup.py | 1 + tests/integration/goldens/credentials/noxfile.py | 5 ++++- tests/integration/goldens/credentials/setup.py | 1 + tests/integration/goldens/eventarc/noxfile.py | 5 ++++- tests/integration/goldens/eventarc/setup.py | 1 + tests/integration/goldens/logging/noxfile.py | 5 ++++- tests/integration/goldens/logging/setup.py | 1 + tests/integration/goldens/logging_internal/noxfile.py | 5 ++++- tests/integration/goldens/logging_internal/setup.py | 1 + tests/integration/goldens/redis/noxfile.py | 5 ++++- tests/integration/goldens/redis/setup.py | 1 + tests/integration/goldens/redis_selective/noxfile.py | 5 ++++- tests/integration/goldens/redis_selective/setup.py | 1 + 21 files changed, 54 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index e5e3c22d19..89bdf25309 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -17,8 +17,14 @@ env: SHOWCASE_VERSION: 0.35.0 PROTOC_VERSION: 3.20.2 OLDEST_PYTHON: 3.7 - LATEST_STABLE_PYTHON: 3.13 + LATEST_STABLE_PYTHON: 3.14 + # TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): + # Switch this to Python 3.15 alpha1 pre-release + # https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON: 3.14 + # TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): + # Add Python 3.15 alpha1 pre-release + # https://peps.python.org/pep-0790/ ALL_PYTHON: "['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']" permissions: diff --git a/gapic/ads-templates/noxfile.py.j2 b/gapic/ads-templates/noxfile.py.j2 index 9a2836cb8f..4d857fd3cc 100644 --- a/gapic/ads-templates/noxfile.py.j2 +++ b/gapic/ads-templates/noxfile.py.j2 @@ -7,6 +7,9 @@ import os import nox # type: ignore +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ ALL_PYTHON = [ "3.7", "3.8", @@ -15,6 +18,7 @@ ALL_PYTHON = [ "3.11", "3.12", "3.13", + "3.14", ] @nox.session(python=ALL_PYTHON) diff --git a/gapic/ads-templates/setup.py.j2 b/gapic/ads-templates/setup.py.j2 index b041173f85..97ed76176d 100644 --- a/gapic/ads-templates/setup.py.j2 +++ b/gapic/ads-templates/setup.py.j2 @@ -73,6 +73,7 @@ setuptools.setup( "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/gapic/templates/noxfile.py.j2 b/gapic/templates/noxfile.py.j2 index e4c356cbf6..bf0f2392f1 100644 --- a/gapic/templates/noxfile.py.j2 +++ b/gapic/templates/noxfile.py.j2 @@ -32,7 +32,10 @@ ALL_PYTHON = [ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/gapic/templates/setup.py.j2 b/gapic/templates/setup.py.j2 index 2f265dd994..c9dd854b97 100644 --- a/gapic/templates/setup.py.j2 +++ b/gapic/templates/setup.py.j2 @@ -94,6 +94,7 @@ setuptools.setup( "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/noxfile.py b/noxfile.py index 99dab8a441..bfc4fff8b4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -47,7 +47,7 @@ "3.14", ) -NEWEST_PYTHON = ALL_PYTHON[-2] +NEWEST_PYTHON = ALL_PYTHON[-1] @nox.session(python=ALL_PYTHON) diff --git a/setup.py b/setup.py index bc48d16750..703c8b367f 100644 --- a/setup.py +++ b/setup.py @@ -77,6 +77,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Software Development :: Code Generators", "Topic :: Software Development :: Libraries :: Python Modules", diff --git a/tests/integration/goldens/asset/noxfile.py b/tests/integration/goldens/asset/noxfile.py index b61714a579..8ac2819c59 100755 --- a/tests/integration/goldens/asset/noxfile.py +++ b/tests/integration/goldens/asset/noxfile.py @@ -39,7 +39,10 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/asset/setup.py b/tests/integration/goldens/asset/setup.py index 5d506dc2d9..101ea9331d 100755 --- a/tests/integration/goldens/asset/setup.py +++ b/tests/integration/goldens/asset/setup.py @@ -88,6 +88,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/tests/integration/goldens/credentials/noxfile.py b/tests/integration/goldens/credentials/noxfile.py index 9dbefde7b9..76c74aa361 100755 --- a/tests/integration/goldens/credentials/noxfile.py +++ b/tests/integration/goldens/credentials/noxfile.py @@ -39,7 +39,10 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/credentials/setup.py b/tests/integration/goldens/credentials/setup.py index 6ffe75b3ba..a4c5041746 100755 --- a/tests/integration/goldens/credentials/setup.py +++ b/tests/integration/goldens/credentials/setup.py @@ -85,6 +85,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/tests/integration/goldens/eventarc/noxfile.py b/tests/integration/goldens/eventarc/noxfile.py index 8a915a5d09..0ea8a292ca 100755 --- a/tests/integration/goldens/eventarc/noxfile.py +++ b/tests/integration/goldens/eventarc/noxfile.py @@ -39,7 +39,10 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/eventarc/setup.py b/tests/integration/goldens/eventarc/setup.py index 4cba69da02..bd40117afd 100755 --- a/tests/integration/goldens/eventarc/setup.py +++ b/tests/integration/goldens/eventarc/setup.py @@ -86,6 +86,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/tests/integration/goldens/logging/noxfile.py b/tests/integration/goldens/logging/noxfile.py index d397b029d2..dc93e7bf6d 100755 --- a/tests/integration/goldens/logging/noxfile.py +++ b/tests/integration/goldens/logging/noxfile.py @@ -39,7 +39,10 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/logging/setup.py b/tests/integration/goldens/logging/setup.py index 23a3a12a2b..a654413004 100755 --- a/tests/integration/goldens/logging/setup.py +++ b/tests/integration/goldens/logging/setup.py @@ -85,6 +85,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/tests/integration/goldens/logging_internal/noxfile.py b/tests/integration/goldens/logging_internal/noxfile.py index d397b029d2..dc93e7bf6d 100755 --- a/tests/integration/goldens/logging_internal/noxfile.py +++ b/tests/integration/goldens/logging_internal/noxfile.py @@ -39,7 +39,10 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/logging_internal/setup.py b/tests/integration/goldens/logging_internal/setup.py index 23a3a12a2b..a654413004 100755 --- a/tests/integration/goldens/logging_internal/setup.py +++ b/tests/integration/goldens/logging_internal/setup.py @@ -85,6 +85,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/tests/integration/goldens/redis/noxfile.py b/tests/integration/goldens/redis/noxfile.py index d798ed9a37..6d4a600608 100755 --- a/tests/integration/goldens/redis/noxfile.py +++ b/tests/integration/goldens/redis/noxfile.py @@ -39,7 +39,10 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/redis/setup.py b/tests/integration/goldens/redis/setup.py index 54fece2f91..7abe41328b 100755 --- a/tests/integration/goldens/redis/setup.py +++ b/tests/integration/goldens/redis/setup.py @@ -89,6 +89,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/tests/integration/goldens/redis_selective/noxfile.py b/tests/integration/goldens/redis_selective/noxfile.py index d798ed9a37..6d4a600608 100755 --- a/tests/integration/goldens/redis_selective/noxfile.py +++ b/tests/integration/goldens/redis_selective/noxfile.py @@ -39,7 +39,10 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2] +DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] +# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Add tests for Python 3.15 alpha1 +# https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON = ALL_PYTHON[-1] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/redis_selective/setup.py b/tests/integration/goldens/redis_selective/setup.py index 54fece2f91..7abe41328b 100755 --- a/tests/integration/goldens/redis_selective/setup.py +++ b/tests/integration/goldens/redis_selective/setup.py @@ -89,6 +89,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Operating System :: OS Independent", "Topic :: Internet", ], From 6dbb45b8d5c7f1c35f5313f55e9e41935ead0216 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 7 Oct 2025 14:52:51 +0000 Subject: [PATCH 2/4] address feedback --- .github/workflows/tests.yaml | 4 ++-- gapic/ads-templates/noxfile.py.j2 | 2 +- gapic/templates/noxfile.py.j2 | 8 ++++---- tests/integration/goldens/asset/noxfile.py | 8 ++++---- tests/integration/goldens/credentials/noxfile.py | 8 ++++---- tests/integration/goldens/eventarc/noxfile.py | 8 ++++---- tests/integration/goldens/logging/noxfile.py | 8 ++++---- tests/integration/goldens/logging_internal/noxfile.py | 8 ++++---- tests/integration/goldens/redis/noxfile.py | 8 ++++---- tests/integration/goldens/redis_selective/noxfile.py | 8 ++++---- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 89bdf25309..9150554b22 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -18,11 +18,11 @@ env: PROTOC_VERSION: 3.20.2 OLDEST_PYTHON: 3.7 LATEST_STABLE_PYTHON: 3.14 - # TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 pre-release # https://peps.python.org/pep-0790/ PRE_RELEASE_PYTHON: 3.14 - # TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Add Python 3.15 alpha1 pre-release # https://peps.python.org/pep-0790/ ALL_PYTHON: "['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']" diff --git a/gapic/ads-templates/noxfile.py.j2 b/gapic/ads-templates/noxfile.py.j2 index 4d857fd3cc..48646feb5e 100644 --- a/gapic/ads-templates/noxfile.py.j2 +++ b/gapic/ads-templates/noxfile.py.j2 @@ -7,7 +7,7 @@ import os import nox # type: ignore -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Add tests for Python 3.15 alpha1 # https://peps.python.org/pep-0790/ ALL_PYTHON = [ diff --git a/gapic/templates/noxfile.py.j2 b/gapic/templates/noxfile.py.j2 index bf0f2392f1..d42664529a 100644 --- a/gapic/templates/noxfile.py.j2 +++ b/gapic/templates/noxfile.py.j2 @@ -32,11 +32,11 @@ ALL_PYTHON = [ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/asset/noxfile.py b/tests/integration/goldens/asset/noxfile.py index 8ac2819c59..7f47c2e32f 100755 --- a/tests/integration/goldens/asset/noxfile.py +++ b/tests/integration/goldens/asset/noxfile.py @@ -39,11 +39,11 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/credentials/noxfile.py b/tests/integration/goldens/credentials/noxfile.py index 76c74aa361..fea13ce79d 100755 --- a/tests/integration/goldens/credentials/noxfile.py +++ b/tests/integration/goldens/credentials/noxfile.py @@ -39,11 +39,11 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/eventarc/noxfile.py b/tests/integration/goldens/eventarc/noxfile.py index 0ea8a292ca..d01d0af935 100755 --- a/tests/integration/goldens/eventarc/noxfile.py +++ b/tests/integration/goldens/eventarc/noxfile.py @@ -39,11 +39,11 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/logging/noxfile.py b/tests/integration/goldens/logging/noxfile.py index dc93e7bf6d..80a2eac47c 100755 --- a/tests/integration/goldens/logging/noxfile.py +++ b/tests/integration/goldens/logging/noxfile.py @@ -39,11 +39,11 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/logging_internal/noxfile.py b/tests/integration/goldens/logging_internal/noxfile.py index dc93e7bf6d..80a2eac47c 100755 --- a/tests/integration/goldens/logging_internal/noxfile.py +++ b/tests/integration/goldens/logging_internal/noxfile.py @@ -39,11 +39,11 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/redis/noxfile.py b/tests/integration/goldens/redis/noxfile.py index 6d4a600608..05c3bd580e 100755 --- a/tests/integration/goldens/redis/noxfile.py +++ b/tests/integration/goldens/redis/noxfile.py @@ -39,11 +39,11 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() diff --git a/tests/integration/goldens/redis_selective/noxfile.py b/tests/integration/goldens/redis_selective/noxfile.py index 6d4a600608..05c3bd580e 100755 --- a/tests/integration/goldens/redis_selective/noxfile.py +++ b/tests/integration/goldens/redis_selective/noxfile.py @@ -39,11 +39,11 @@ "3.14", ] -DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1] -# TOOD(https://github.com/googleapis/gapic-generator-python/issues/2450): -# Add tests for Python 3.15 alpha1 +DEFAULT_PYTHON_VERSION = "3.14" +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): +# Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = ALL_PYTHON[-1] +PRE_RELEASE_PYTHON = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() From 560e73aa1248d31239fdb8524e26926d9c771401 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 7 Oct 2025 15:01:18 +0000 Subject: [PATCH 3/4] s/pre-release/preview/g --- .github/workflows/tests.yaml | 6 +++--- gapic/templates/noxfile.py.j2 | 4 ++-- tests/integration/goldens/asset/noxfile.py | 4 ++-- tests/integration/goldens/credentials/noxfile.py | 4 ++-- tests/integration/goldens/eventarc/noxfile.py | 4 ++-- tests/integration/goldens/logging/noxfile.py | 4 ++-- tests/integration/goldens/logging_internal/noxfile.py | 4 ++-- tests/integration/goldens/redis/noxfile.py | 4 ++-- tests/integration/goldens/redis_selective/noxfile.py | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9150554b22..9db56f8b0c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -21,7 +21,7 @@ env: # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 pre-release # https://peps.python.org/pep-0790/ - PRE_RELEASE_PYTHON: 3.14 + PREVIEW_PYTHON_VERSION: 3.14 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Add Python 3.15 alpha1 pre-release # https://peps.python.org/pep-0790/ @@ -437,10 +437,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - - name: Set up Python ${{ env.PRE_RELEASE_PYTHON }} + - name: Set up Python ${{ env.PREVIEW_PYTHON_VERSION }} uses: actions/setup-python@v6 with: - python-version: "${{ env.PRE_RELEASE_PYTHON }}" + python-version: "${{ env.PREVIEW_PYTHON_VERSION }}" cache: 'pip' allow-prereleases: true - name: Install nox. diff --git a/gapic/templates/noxfile.py.j2 b/gapic/templates/noxfile.py.j2 index d42664529a..998bf4d755 100644 --- a/gapic/templates/noxfile.py.j2 +++ b/gapic/templates/noxfile.py.j2 @@ -36,7 +36,7 @@ DEFAULT_PYTHON_VERSION = "3.14" # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -432,7 +432,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], diff --git a/tests/integration/goldens/asset/noxfile.py b/tests/integration/goldens/asset/noxfile.py index 7f47c2e32f..f84ffacccb 100755 --- a/tests/integration/goldens/asset/noxfile.py +++ b/tests/integration/goldens/asset/noxfile.py @@ -43,7 +43,7 @@ # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -426,7 +426,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], diff --git a/tests/integration/goldens/credentials/noxfile.py b/tests/integration/goldens/credentials/noxfile.py index fea13ce79d..105bfcd875 100755 --- a/tests/integration/goldens/credentials/noxfile.py +++ b/tests/integration/goldens/credentials/noxfile.py @@ -43,7 +43,7 @@ # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -426,7 +426,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], diff --git a/tests/integration/goldens/eventarc/noxfile.py b/tests/integration/goldens/eventarc/noxfile.py index d01d0af935..8bae83da95 100755 --- a/tests/integration/goldens/eventarc/noxfile.py +++ b/tests/integration/goldens/eventarc/noxfile.py @@ -43,7 +43,7 @@ # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -426,7 +426,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], diff --git a/tests/integration/goldens/logging/noxfile.py b/tests/integration/goldens/logging/noxfile.py index 80a2eac47c..b6faf4d5d2 100755 --- a/tests/integration/goldens/logging/noxfile.py +++ b/tests/integration/goldens/logging/noxfile.py @@ -43,7 +43,7 @@ # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -426,7 +426,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], diff --git a/tests/integration/goldens/logging_internal/noxfile.py b/tests/integration/goldens/logging_internal/noxfile.py index 80a2eac47c..b6faf4d5d2 100755 --- a/tests/integration/goldens/logging_internal/noxfile.py +++ b/tests/integration/goldens/logging_internal/noxfile.py @@ -43,7 +43,7 @@ # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -426,7 +426,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], diff --git a/tests/integration/goldens/redis/noxfile.py b/tests/integration/goldens/redis/noxfile.py index 05c3bd580e..87cb9815b6 100755 --- a/tests/integration/goldens/redis/noxfile.py +++ b/tests/integration/goldens/redis/noxfile.py @@ -43,7 +43,7 @@ # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -426,7 +426,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], diff --git a/tests/integration/goldens/redis_selective/noxfile.py b/tests/integration/goldens/redis_selective/noxfile.py index 05c3bd580e..87cb9815b6 100755 --- a/tests/integration/goldens/redis_selective/noxfile.py +++ b/tests/integration/goldens/redis_selective/noxfile.py @@ -43,7 +43,7 @@ # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ -PRE_RELEASE_PYTHON = "3.14" +PREVIEW_PYTHON_VERSION = "3.14" CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() @@ -426,7 +426,7 @@ def docfx(session): ) -@nox.session(python=PRE_RELEASE_PYTHON) +@nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", ["python", "upb", "cpp"], From f96a7f9c13426cff992e1bcafd1db09ec3677046 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 7 Oct 2025 20:33:04 +0000 Subject: [PATCH 4/4] address feedback --- gapic/templates/noxfile.py.j2 | 1 + tests/integration/goldens/asset/noxfile.py | 1 + tests/integration/goldens/credentials/noxfile.py | 1 + tests/integration/goldens/eventarc/noxfile.py | 1 + tests/integration/goldens/logging/noxfile.py | 1 + tests/integration/goldens/logging_internal/noxfile.py | 1 + tests/integration/goldens/redis/noxfile.py | 1 + tests/integration/goldens/redis_selective/noxfile.py | 1 + 8 files changed, 8 insertions(+) diff --git a/gapic/templates/noxfile.py.j2 b/gapic/templates/noxfile.py.j2 index 998bf4d755..976fa2ccad 100644 --- a/gapic/templates/noxfile.py.j2 +++ b/gapic/templates/noxfile.py.j2 @@ -33,6 +33,7 @@ ALL_PYTHON = [ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ diff --git a/tests/integration/goldens/asset/noxfile.py b/tests/integration/goldens/asset/noxfile.py index f84ffacccb..842750346c 100755 --- a/tests/integration/goldens/asset/noxfile.py +++ b/tests/integration/goldens/asset/noxfile.py @@ -40,6 +40,7 @@ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ diff --git a/tests/integration/goldens/credentials/noxfile.py b/tests/integration/goldens/credentials/noxfile.py index 105bfcd875..e5f8864a33 100755 --- a/tests/integration/goldens/credentials/noxfile.py +++ b/tests/integration/goldens/credentials/noxfile.py @@ -40,6 +40,7 @@ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ diff --git a/tests/integration/goldens/eventarc/noxfile.py b/tests/integration/goldens/eventarc/noxfile.py index 8bae83da95..9af468e682 100755 --- a/tests/integration/goldens/eventarc/noxfile.py +++ b/tests/integration/goldens/eventarc/noxfile.py @@ -40,6 +40,7 @@ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ diff --git a/tests/integration/goldens/logging/noxfile.py b/tests/integration/goldens/logging/noxfile.py index b6faf4d5d2..0aa3b63010 100755 --- a/tests/integration/goldens/logging/noxfile.py +++ b/tests/integration/goldens/logging/noxfile.py @@ -40,6 +40,7 @@ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ diff --git a/tests/integration/goldens/logging_internal/noxfile.py b/tests/integration/goldens/logging_internal/noxfile.py index b6faf4d5d2..0aa3b63010 100755 --- a/tests/integration/goldens/logging_internal/noxfile.py +++ b/tests/integration/goldens/logging_internal/noxfile.py @@ -40,6 +40,7 @@ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ diff --git a/tests/integration/goldens/redis/noxfile.py b/tests/integration/goldens/redis/noxfile.py index 87cb9815b6..d52df038ca 100755 --- a/tests/integration/goldens/redis/noxfile.py +++ b/tests/integration/goldens/redis/noxfile.py @@ -40,6 +40,7 @@ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/ diff --git a/tests/integration/goldens/redis_selective/noxfile.py b/tests/integration/goldens/redis_selective/noxfile.py index 87cb9815b6..d52df038ca 100755 --- a/tests/integration/goldens/redis_selective/noxfile.py +++ b/tests/integration/goldens/redis_selective/noxfile.py @@ -40,6 +40,7 @@ ] DEFAULT_PYTHON_VERSION = "3.14" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2450): # Switch this to Python 3.15 alpha1 # https://peps.python.org/pep-0790/