Skip to content

Commit b0e4b6b

Browse files
committed
Merge branch 'main' into shuowei-fix-sqlglot-null-cast
2 parents a423241 + 4f5593a commit b0e4b6b

54 files changed

Lines changed: 726 additions & 476 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.

.github/workflows/django-spanner-django5.2_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
outputs:
2222
run_django_spanner: ${{ steps.filter.outputs.django_spanner }}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525
- uses: dorny/paths-filter@v3
2626
id: filter
2727
with:
@@ -68,9 +68,9 @@ jobs:
6868

6969
steps:
7070
- name: Checkout code
71-
uses: actions/checkout@v4
71+
uses: actions/checkout@v6
7272
- name: Setup Python
73-
uses: actions/setup-python@v5
73+
uses: actions/setup-python@v6
7474
with:
7575
python-version: "3.10"
7676
- name: Run Django tests

.github/workflows/unittest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
python: ['3.9', '3.10', "3.11", "3.12", "3.13", "3.14"]
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
# Use a fetch-depth of 2 to avoid error `fatal: origin/main...HEAD: no merge base`
2525
# See https://github.com/googleapis/google-cloud-python/issues/12013
2626
# and https://github.com/actions/checkout#checkout-head.
2727
with:
2828
fetch-depth: 2
2929
- name: Setup Python
30-
uses: actions/setup-python@v5
30+
uses: actions/setup-python@v6
3131
with:
3232
python-version: ${{ matrix.python }}
3333
- name: Install nox
@@ -79,7 +79,7 @@ jobs:
7979
python -m pip install coverage
8080
- name: Download coverage results
8181
if: ${{ steps.packages.outputs.num_files_changed > 0 }}
82-
uses: actions/download-artifact@v4
82+
uses: actions/download-artifact@v5
8383
with:
8484
path: .coverage-results/
8585
- name: Report coverage results

.librarian/generator-input/client-post-processing/datastore-integration.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,42 @@ replacements:
3939
"google-cloud-core >= 2.0.0, <3.0.0",
4040
"grpcio >= 1.59.0, < 2.0.0",
4141
count: 1
42+
- paths: [
43+
"packages/google-cloud-datastore/mypy.ini",
44+
]
45+
before: |-
46+
# Performance: reuse results from previous runs to speed up 'nox'
47+
incremental = True
48+
after: |-
49+
# Performance: reuse results from previous runs to speed up "nox"
50+
incremental = True
51+
52+
[mypy-google.cloud.datastore._app_engine_key_pb2]
53+
ignore_errors = True
54+
55+
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410):
56+
# Remove once this generator bug is fixed
57+
[mypy-google.cloud.datastore_v1.services.datastore.async_client]
58+
ignore_errors = True
59+
60+
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410):
61+
# Remove once this generator bug is fixed
62+
[mypy-google.cloud.datastore_v1.services.datastore.client]
63+
ignore_errors = True
64+
count: 1
65+
- paths: [
66+
"packages/google-cloud-datastore/mypy.ini",
67+
]
68+
before: |
69+
ignore_missing_imports = False
70+
71+
# TODO\(https://github.com/googleapis/gapic-generator-python/issues/2563\):
72+
# Dependencies that historically lacks py.typed markers
73+
\[mypy-google\.iam\.\*\]
74+
ignore_missing_imports = True
75+
after: |
76+
ignore_missing_imports = True
77+
count: 1
4278
- paths: [
4379
"packages/google-cloud-datastore/docs/index.rst",
4480
]

mypy.ini

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

packages/bigframes/bigframes/functions/_function_session.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,9 @@ def wrapper(func):
592592
if reuse is not None:
593593
cf_endpoint = self._function_client.get_cloud_function_endpoint(cf_name)
594594

595-
if cf_endpoint is None:
595+
# If the endpoint is empty, the function might exist but the URL propagation is pending.
596+
# Running create_cloud_function will handle AlreadyExists and retry endpoint fetching.
597+
if not cf_endpoint:
596598
cf_endpoint = self._function_client.create_cloud_function(
597599
cf_name, cloud_func_spec
598600
)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[mypy]
2+
python_version = 3.10
3+
namespace_packages = True

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,10 @@
33
{% block content %}
44

55
import os
6-
import pathlib
76

87
import nox # type: ignore
98

109

11-
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
12-
# Path to the centralized mypy configuration file at the repository root.
13-
MYPY_CONFIG_FILE = str(CURRENT_DIRECTORY.parent.parent / "mypy.ini")
14-
15-
1610
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):
1711
# Add tests for Python 3.15 alpha1
1812
# https://peps.python.org/pep-0790/
@@ -50,7 +44,6 @@ def mypy(session):
5044
session.install('.')
5145
session.run(
5246
'mypy',
53-
f"--config-file={MYPY_CONFIG_FILE}",
5447
{% if api.naming.module_namespace %}
5548
'{{ api.naming.module_namespace[0] }}',
5649
{% else %}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[mypy]
2+
python_version = 3.14
3+
namespace_packages = True
4+
ignore_missing_imports = False
5+
6+
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563):
7+
# Dependencies that historically lacks py.typed markers
8+
[mypy-google.iam.*]
9+
ignore_missing_imports = True
10+
11+
# Helps mypy navigate the 'google' namespace more reliably in 3.10+
12+
explicit_package_bases = True
13+
14+
# Performance: reuse results from previous runs to speed up 'nox'
15+
incremental = True

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ DEFAULT_PYTHON_VERSION = "3.14"
4040
PREVIEW_PYTHON_VERSION = "3.14"
4141

4242
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
43-
# Path to the centralized mypy configuration file at the repository root.
44-
MYPY_CONFIG_FILE = str(CURRENT_DIRECTORY.parent.parent / "mypy.ini")
4543

4644
if (CURRENT_DIRECTORY / "testing").exists():
4745
LOWER_BOUND_CONSTRAINTS_FILE = (
@@ -103,7 +101,6 @@ def mypy(session):
103101
session.install(".")
104102
session.run(
105103
"mypy",
106-
f"--config-file={MYPY_CONFIG_FILE}",
107104
"-p",
108105
{% if api.naming.module_namespace %}
109106
"{{ api.naming.module_namespace[0] }}",
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[mypy]
2+
python_version = 3.14
3+
namespace_packages = True
4+
ignore_missing_imports = False
5+
6+
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563):
7+
# Dependencies that historically lacks py.typed markers
8+
[mypy-google.iam.*]
9+
ignore_missing_imports = True
10+
11+
# Helps mypy navigate the 'google' namespace more reliably in 3.10+
12+
explicit_package_bases = True
13+
14+
# Performance: reuse results from previous runs to speed up 'nox'
15+
incremental = True

0 commit comments

Comments
 (0)