Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,14 @@ env:
SHOWCASE_VERSION: 0.35.0
PROTOC_VERSION: 3.20.2
OLDEST_PYTHON: 3.7
LATEST_STABLE_PYTHON: 3.13
PRE_RELEASE_PYTHON: 3.14
LATEST_STABLE_PYTHON: 3.14
# 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/
PREVIEW_PYTHON_VERSION: 3.14
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):
Comment on lines +20 to +25
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
LATEST_STABLE_PYTHON: 3.14
# 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/
PREVIEW_PYTHON_VERSION: 3.14
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):
LATEST_STABLE_PYTHON: 3.14
# 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/
PREVIEW_PYTHON_VERSION: 3.14
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m going to address this in a follow up PR which adds 3.15 prerelease tests

# 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:
Expand Down Expand Up @@ -431,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.
Expand Down
4 changes: 4 additions & 0 deletions gapic/ads-templates/noxfile.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import os
import nox # type: ignore


# 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 = [
"3.7",
"3.8",
Expand All @@ -15,6 +18,7 @@ ALL_PYTHON = [
"3.11",
"3.12",
"3.13",
"3.14",
]

@nox.session(python=ALL_PYTHON)
Expand Down
1 change: 1 addition & 0 deletions gapic/ads-templates/setup.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 7 additions & 3 deletions gapic/templates/noxfile.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@ ALL_PYTHON = [
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -429,7 +433,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions gapic/templates/setup.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"3.14",
)

NEWEST_PYTHON = ALL_PYTHON[-2]
NEWEST_PYTHON = ALL_PYTHON[-1]


@nox.session(python=ALL_PYTHON)
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 7 additions & 3 deletions tests/integration/goldens/asset/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -423,7 +427,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions tests/integration/goldens/asset/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 7 additions & 3 deletions tests/integration/goldens/credentials/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -423,7 +427,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions tests/integration/goldens/credentials/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 7 additions & 3 deletions tests/integration/goldens/eventarc/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -423,7 +427,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions tests/integration/goldens/eventarc/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 7 additions & 3 deletions tests/integration/goldens/logging/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -423,7 +427,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions tests/integration/goldens/logging/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 7 additions & 3 deletions tests/integration/goldens/logging_internal/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -423,7 +427,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions tests/integration/goldens/logging_internal/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 7 additions & 3 deletions tests/integration/goldens/redis/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -423,7 +427,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions tests/integration/goldens/redis/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 7 additions & 3 deletions tests/integration/goldens/redis_selective/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
"3.14",
]

DEFAULT_PYTHON_VERSION = ALL_PYTHON[-2]
PRE_RELEASE_PYTHON = ALL_PYTHON[-1]
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/
PREVIEW_PYTHON_VERSION = "3.14"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -423,7 +427,7 @@ def docfx(session):
)


@nox.session(python=PRE_RELEASE_PYTHON)
@nox.session(python=PREVIEW_PYTHON_VERSION)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
Expand Down
1 change: 1 addition & 0 deletions tests/integration/goldens/redis_selective/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down