Skip to content

Commit 4145bf3

Browse files
committed
Merge branch 'main' into reenable_core_deps_presubmit
2 parents 40cbb8a + 02d1fd8 commit 4145bf3

963 files changed

Lines changed: 395543 additions & 6576 deletions

File tree

Some content is hidden

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

librarian.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ version: v0.39.0
1616
repo: googleapis/google-cloud-python
1717
sources:
1818
googleapis:
19-
commit: 8856eed71a9cb2b9829d2617ee57fe2d8871a691
20-
sha256: 54104af35306b605a97f7d1b98b9b96f4a507cd18322b44d81f62eca17969b3a
19+
commit: 50aad1b835b0b1fd3acec6af91d9c9735787fe11
20+
sha256: e58f3198fb96392a89b2850cca67882456f8d231ea4849f16cfb5551a012789d
2121
tools:
2222
pip:
2323
- name: black
2424
version: 23.7.0
2525
package: black[jupyter]==23.7.0
2626
- name: gapic-generator
27-
version: 1.37.1
27+
version: 1.39.0
2828
- name: isort
2929
version: 5.11.0
3030
- name: nox
@@ -554,6 +554,7 @@ libraries:
554554
- name: google-cloud-biglake-hive
555555
version: 0.3.2
556556
apis:
557+
- path: google/cloud/biglake/hive/v1
557558
- path: google/cloud/biglake/hive/v1beta
558559
python:
559560
default_version: v1beta
@@ -1999,6 +2000,19 @@ libraries:
19992000
library_type: GAPIC_COMBO
20002001
metadata_name_override: speech
20012002
default_version: v1
2003+
- name: google-cloud-sql
2004+
version: 0.0.0
2005+
apis:
2006+
- path: google/cloud/sql/v1
2007+
- path: google/cloud/sql/v1beta4
2008+
copyright_year: "2026"
2009+
python:
2010+
opt_args_by_api:
2011+
google/cloud/sql/v1:
2012+
- resource-name-alias=backupdr.googleapis.com/Backup:BackupDRBackup
2013+
google/cloud/sql/v1beta4:
2014+
- resource-name-alias=backupdr.googleapis.com/Backup:BackupDRBackup
2015+
default_version: v1
20022016
- name: google-cloud-storage
20032017
version: 3.14.0
20042018
apis:

packages/django-google-spanner/noxfile.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@ def lint(session):
8888
"""
8989
session.install("flake8", RUFF_VERSION)
9090

91+
# 1. Check imports
92+
session.run(
93+
"ruff",
94+
"check",
95+
"--select",
96+
"I",
97+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
98+
"--line-length=88",
99+
*LINT_PATHS,
100+
)
101+
91102
# 2. Check formatting
92103
session.run(
93104
"ruff",

packages/gapic-generator/gapic/templates/noxfile.py.j2

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,15 @@ def lint(session):
157157
"""
158158
session.install("flake8", RUFF_VERSION)
159159
160+
# 1. Check imports
161+
session.run(
162+
"ruff", "check",
163+
"--select", "I",
164+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
165+
"--line-length=88",
166+
*LINT_PATHS,
167+
)
168+
160169
# 2. Check formatting
161170
session.run(
162171
"ruff", "format",

packages/gapic-generator/noxfile.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,17 @@ def lint(session):
760760

761761
session.install("flake8", RUFF_VERSION)
762762

763+
# 1. Check imports
764+
session.run(
765+
"ruff",
766+
"check",
767+
"--select",
768+
"I",
769+
*LINT_PATHS,
770+
"--exclude",
771+
RUFF_EXCLUDES,
772+
)
773+
763774
# 2. Check formatting
764775
session.run(
765776
"ruff",

packages/gapic-generator/tests/integration/goldens/asset/noxfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ def lint(session):
160160
"""
161161
session.install("flake8", RUFF_VERSION)
162162

163+
# 1. Check imports
164+
session.run(
165+
"ruff", "check",
166+
"--select", "I",
167+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
168+
"--line-length=88",
169+
*LINT_PATHS,
170+
)
171+
163172
# 2. Check formatting
164173
session.run(
165174
"ruff", "format",

packages/gapic-generator/tests/integration/goldens/credentials/noxfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ def lint(session):
160160
"""
161161
session.install("flake8", RUFF_VERSION)
162162

163+
# 1. Check imports
164+
session.run(
165+
"ruff", "check",
166+
"--select", "I",
167+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
168+
"--line-length=88",
169+
*LINT_PATHS,
170+
)
171+
163172
# 2. Check formatting
164173
session.run(
165174
"ruff", "format",

packages/gapic-generator/tests/integration/goldens/eventarc/noxfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ def lint(session):
160160
"""
161161
session.install("flake8", RUFF_VERSION)
162162

163+
# 1. Check imports
164+
session.run(
165+
"ruff", "check",
166+
"--select", "I",
167+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
168+
"--line-length=88",
169+
*LINT_PATHS,
170+
)
171+
163172
# 2. Check formatting
164173
session.run(
165174
"ruff", "format",

packages/gapic-generator/tests/integration/goldens/logging/noxfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ def lint(session):
160160
"""
161161
session.install("flake8", RUFF_VERSION)
162162

163+
# 1. Check imports
164+
session.run(
165+
"ruff", "check",
166+
"--select", "I",
167+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
168+
"--line-length=88",
169+
*LINT_PATHS,
170+
)
171+
163172
# 2. Check formatting
164173
session.run(
165174
"ruff", "format",

packages/gapic-generator/tests/integration/goldens/logging_internal/noxfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ def lint(session):
160160
"""
161161
session.install("flake8", RUFF_VERSION)
162162

163+
# 1. Check imports
164+
session.run(
165+
"ruff", "check",
166+
"--select", "I",
167+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
168+
"--line-length=88",
169+
*LINT_PATHS,
170+
)
171+
163172
# 2. Check formatting
164173
session.run(
165174
"ruff", "format",

packages/gapic-generator/tests/integration/goldens/redis/noxfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ def lint(session):
160160
"""
161161
session.install("flake8", RUFF_VERSION)
162162

163+
# 1. Check imports
164+
session.run(
165+
"ruff", "check",
166+
"--select", "I",
167+
f"--target-version=py{ALL_PYTHON[0].replace('.', '')}",
168+
"--line-length=88",
169+
*LINT_PATHS,
170+
)
171+
163172
# 2. Check formatting
164173
session.run(
165174
"ruff", "format",

0 commit comments

Comments
 (0)