Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit 0fd2443

Browse files
Merge branch 'main' into unpin_mypy
2 parents 8d236ca + 535d654 commit 0fd2443

51 files changed

Lines changed: 370 additions & 652 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tests.yaml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616
env:
1717
SHOWCASE_VERSION: 0.35.0
1818
PROTOC_VERSION: 3.20.2
19-
OLDEST_PYTHON: 3.7
19+
OLDEST_PYTHON: 3.9
2020
LATEST_STABLE_PYTHON: 3.14
2121
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):
2222
# Switch this to Python 3.15 alpha1 pre-release
@@ -25,7 +25,7 @@ env:
2525
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):
2626
# Add Python 3.15 alpha1 pre-release
2727
# https://peps.python.org/pep-0790/
28-
ALL_PYTHON: "['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']"
28+
ALL_PYTHON: "['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']"
2929

3030
permissions:
3131
contents: read
@@ -93,9 +93,6 @@ jobs:
9393
# Run mypy on all of the supported python versions listed in setup.py
9494
# https://github.com/python/mypy/blob/master/setup.py
9595
python: ${{ fromJSON(needs.all_python_setup.outputs.all_python) }}
96-
exclude:
97-
# Remove once https://github.com/googleapis/gapic-generator-python/issues/2303 is fixed
98-
- python: '3.7'
9996
runs-on: ubuntu-latest
10097
steps:
10198
- uses: actions/checkout@v5
@@ -119,9 +116,7 @@ jobs:
119116
target: [showcase, showcase_w_rest_async]
120117
logging_scope: ["", "google"]
121118

122-
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2303): use `ubuntu-latest` once this bug is fixed.
123-
# Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
124-
runs-on: ubuntu-22.04
119+
runs-on: ubuntu-latest
125120
steps:
126121
- uses: actions/checkout@v5
127122
- name: Set up Python "${{ matrix.python }}"
@@ -212,9 +207,7 @@ jobs:
212207
variant: ['', _alternative_templates, _mixins, _alternative_templates_mixins, _w_rest_async]
213208
logging_scope: ["", "google"]
214209

215-
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2303): use `ubuntu-latest` once this bug is fixed.
216-
# Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
217-
runs-on: ubuntu-22.04
210+
runs-on: ubuntu-latest
218211
steps:
219212
- uses: actions/checkout@v5
220213
- name: Set up Python "${{ matrix.python }}"
@@ -318,9 +311,7 @@ jobs:
318311
strategy:
319312
matrix:
320313
python: ${{ fromJSON(needs.all_python_setup.outputs.all_python) }}
321-
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2303): use `ubuntu-latest` once this bug is fixed.
322-
# Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
323-
runs-on: ubuntu-22.04
314+
runs-on: ubuntu-latest
324315
steps:
325316
- uses: actions/checkout@v5
326317
- name: Set up Python ${{ matrix.python }}
@@ -344,9 +335,7 @@ jobs:
344335
matrix:
345336
python: ${{ fromJSON(needs.all_python_setup.outputs.all_python) }}
346337
variant: ['', _alternative_templates]
347-
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2303): use `ubuntu-latest` once this bug is fixed.
348-
# Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
349-
runs-on: ubuntu-22.04
338+
runs-on: ubuntu-latest
350339
steps:
351340
- uses: actions/checkout@v5
352341
- name: Set up Python ${{ matrix.python }}
@@ -446,15 +435,15 @@ jobs:
446435
- name: Install nox.
447436
run: |
448437
python -m pip install nox
449-
- name: Run the prerelease_deps nox session
438+
- name: Run the prerelease_deps and core_deps_from_source nox sessions
450439
# Exclude testing for asset which requires dependency google-cloud-org-policy
451440
# in order to run unit tests
452441
# See https://github.com/googleapis/gapic-generator-python/issues/1806
453442
run: |
454-
nox -f tests/integration/goldens/credentials/noxfile.py -s prerelease_deps
455-
nox -f tests/integration/goldens/eventarc/noxfile.py -s prerelease_deps
456-
nox -f tests/integration/goldens/logging/noxfile.py -s prerelease_deps
457-
nox -f tests/integration/goldens/redis/noxfile.py -s prerelease_deps
443+
nox -f tests/integration/goldens/credentials/noxfile.py -s prerelease_deps core_deps_from_source
444+
nox -f tests/integration/goldens/eventarc/noxfile.py -s prerelease_deps core_deps_from_source
445+
nox -f tests/integration/goldens/logging/noxfile.py -s prerelease_deps core_deps_from_source
446+
nox -f tests/integration/goldens/redis/noxfile.py -s prerelease_deps core_deps_from_source
458447
lint:
459448
runs-on: ubuntu-latest
460449
steps:

.librarian/state.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:68c7c79adf43af1be4c0527673342dd180aebebf652ea623614eaebff924ca27
22
libraries:
33
- id: gapic-generator
4-
version: 1.30.8
4+
version: 1.30.9
55
last_generated_commit: ""
66
apis: []
77
source_roots:

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
[1]: https://pypi.org/project/gapic-generator/#history
66

7+
## [1.30.9](https://github.com/googleapis/gapic-generator-python/compare/v1.30.8...v1.30.9) (2026-02-19)
8+
79
## [1.30.8](https://github.com/googleapis/gapic-generator-python/compare/v1.30.7...v1.30.8) (2026-02-09)
810

911
## [1.30.7](https://github.com/googleapis/gapic-generator-python/compare/v1.30.6...v1.30.7) (2026-02-05)

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
Execute unit tests by running one of the sessions prefixed with `unit-`.
2020

21-
- Example: `nox -s unit-3.8`
21+
- Example: `nox -s unit-3.13`
2222
- See all Nox sessions with `nox -l`.
2323

2424
## Formatting

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ API Client Generator for Python
55

66
|release level| |pypi| |versions|
77

8-
A generator for protocol buffer described APIs for and in Python 3.
8+
A client library generator for APIs described through protocol buffers.
99

1010
This is a generator for API client libraries for APIs
1111
specified by `protocol buffers`_, such as those inside Google.

gapic/ads-templates/noxfile.py.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import nox # type: ignore
1111
# Add tests for Python 3.15 alpha1
1212
# https://peps.python.org/pep-0790/
1313
ALL_PYTHON = [
14-
"3.7",
15-
"3.8",
1614
"3.9",
1715
"3.10",
1816
"3.11",

gapic/ads-templates/setup.py.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ dependencies = [
3434
"googleapis-common-protos >= 1.53.0",
3535
"grpcio >= 1.10.0",
3636
"proto-plus >= 1.22.3, <2.0.0",
37+
"protobuf >= 4.25.8, <7.0.0",
3738
{% if api.requires_package(('google', 'iam', 'v1')) %}
3839
"grpc-google-iam-v1",
3940
{% endif %}
@@ -63,8 +64,6 @@ setuptools.setup(
6364
"License :: OSI Approved :: Apache Software License",
6465
"Programming Language :: Python",
6566
"Programming Language :: Python :: 3",
66-
"Programming Language :: Python :: 3.7",
67-
"Programming Language :: Python :: 3.8",
6867
"Programming Language :: Python :: 3.9",
6968
"Programming Language :: Python :: 3.10",
7069
"Programming Language :: Python :: 3.11",
@@ -76,7 +75,7 @@ setuptools.setup(
7675
],
7776
platforms="Posix; MacOS X; Windows",
7877
packages=packages,
79-
python_requires=">=3.7",
78+
python_requires=">=3.9",
8079
install_requires=dependencies,
8180
include_package_data=True,
8281
zip_safe=False,

gapic/templates/noxfile.py.j2

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ if os.path.isdir("samples"):
2525
LINT_PATHS.append("samples")
2626

2727
ALL_PYTHON = [
28-
"3.7",
29-
"3.8",
3028
"3.9",
3129
"3.10",
3230
"3.11",
@@ -294,7 +292,11 @@ def unit(session, protobuf_implementation):
294292

295293

296294
def install_systemtest_dependencies(session, *constraints):
297-
session.install("--pre", "grpcio")
295+
{# Note that grpcio<=1.62.2 works on Python 3.11 but fails on 3.12+ because it requires pkg_resources for its source build. #}
296+
if session.python >= "3.12":
297+
session.install("--pre", "grpcio>=1.75.1")
298+
else:
299+
session.install("--pre", "grpcio<=1.62.2")
298300

299301
session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints)
300302

@@ -517,7 +519,7 @@ def prerelease_deps(session, protobuf_implementation):
517519
"google-api-core",
518520
"google-auth",
519521
"grpc-google-iam-v1",
520-
"grpcio",
522+
"grpcio>=1.75.1" if session.python >= "3.12" else "grpcio<=1.62.2",
521523
"grpcio-status",
522524
"protobuf",
523525
"proto-plus",
@@ -611,10 +613,10 @@ def core_deps_from_source(session, protobuf_implementation):
611613
# the `prerel_deps` list in the `prerelease_deps` nox session should also be updated.
612614
core_dependencies_from_source = [
613615
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
614-
"google-api-core @ git+https://github.com/googleapis/python-api-core.git",
616+
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
615617
"google-auth @ git+https://github.com/googleapis/google-auth-library-python.git",
616618
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
617-
"proto-plus @ git+https://github.com/googleapis/proto-plus-python.git",
619+
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
618620
]
619621

620622
for dep in core_dependencies_from_source:

gapic/templates/setup.py.j2

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ else:
3333
release_status = "Development Status :: 5 - Production/Stable"
3434

3535
dependencies = [
36-
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
36+
"google-api-core[grpc] >= 2.11.0, <3.0.0",
3737
# Exclude incompatible versions of `google-auth`
3838
# See https://github.com/googleapis/google-cloud-python/issues/12364
3939
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
@@ -42,7 +42,7 @@ dependencies = [
4242
"proto-plus >= 1.22.3, <2.0.0",
4343
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
4444
{# Explicitly exclude protobuf versions mentioned in https://cloud.google.com/support/bulletins#GCP-2022-019 #}
45-
"protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
45+
"protobuf >= 4.25.8, <7.0.0",
4646
{% for package_tuple, package_info in pypi_packages.items() %}
4747
{# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #}
4848
{% if api.naming.warehouse_package_name != package_info.package_name %}
@@ -89,8 +89,6 @@ setuptools.setup(
8989
"License :: OSI Approved :: Apache Software License",
9090
"Programming Language :: Python",
9191
"Programming Language :: Python :: 3",
92-
"Programming Language :: Python :: 3.7",
93-
"Programming Language :: Python :: 3.8",
9492
"Programming Language :: Python :: 3.9",
9593
"Programming Language :: Python :: 3.10",
9694
"Programming Language :: Python :: 3.11",
@@ -102,7 +100,7 @@ setuptools.setup(
102100
],
103101
platforms="Posix; MacOS X; Windows",
104102
packages=packages,
105-
python_requires=">=3.7",
103+
python_requires=">=3.9",
106104
install_requires=dependencies,
107105
extras_require=extras,
108106
include_package_data=True,

gapic/templates/testing/constraints-3.7.txt.j2

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)