Skip to content

Commit 66fe150

Browse files
shuoweilshuoweil
committed
Merge branch 'main' into shuowei-filter-execution-history
2 parents 0ef9216 + f530a2c commit 66fe150

147 files changed

Lines changed: 3196 additions & 1493 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/config.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ global_files_allowlist:
1515
libraries:
1616
# libraries have "release_blocked: true" so that releases are
1717
# explicitly initiated.
18-
# TODO(https://github.com/googleapis/google-cloud-python/issues/16487):
19-
# Allow releases for google-cloud-storage once this bug is fixed.
20-
- id: "google-cloud-storage"
21-
release_blocked: true
2218
# TODO(https://github.com/googleapis/google-cloud-python/issues/16489):
2319
# Allow releases for bigframes once the bug above is fixed.
2420
- id: "bigframes"

‎.librarian/generator-input/client-post-processing/asset-integration.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
description: Resolves asset dependency issue by adding google-cloud-org-policy
15+
url: https://github.com/googleapis/google-cloud-python/issues/17152
16+
replacements:
17+
- paths: [
18+
packages/google-cloud-asset/setup.py
19+
]
20+
before: |
21+
dependencies = \[
22+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
23+
# Exclude incompatible versions of `google-auth`
24+
# See https://github.com/googleapis/google-cloud-python/issues/12364
25+
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
26+
"grpcio >= 1.44.0, < 2.0.0",
27+
after: |
28+
dependencies = [
29+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
30+
# Exclude incompatible versions of `google-auth`
31+
# See https://github.com/googleapis/google-cloud-python/issues/12364
32+
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
33+
"google-cloud-org-policy >= 1.11.1, <2.0.0",
34+
"grpcio >= 1.44.0, < 2.0.0",
35+
36+
count: 1
37+
- paths: [
38+
packages/google-cloud-asset/testing/constraints-3.10.txt
39+
]
40+
before: |
41+
google-api-core==2.17.1
42+
google-auth==2.14.1
43+
after: |
44+
google-api-core==2.17.1
45+
google-cloud-org-policy==1.11.1
46+
google-auth==2.14.1
47+
count: 1

‎.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ replacements:
161161
]
162162
before: extras = \{\}
163163
after: |
164-
extras = {"pandas": "pandas >= 1.1.3"}
164+
extras = {"pandas": "pandas >= 1.3.4"}
165165
count: 1
166166
- paths: [
167167
packages/google-cloud-monitoring/noxfile.py,
@@ -414,3 +414,21 @@ replacements:
414414
before: '\n "--check-untyped-defs",'
415415
after: '\n # TODO(https://github.com/googleapis/google-cloud-python/issues/16083)\n # "--check-untyped-defs",'
416416
count: 1
417+
- paths: [
418+
"packages/google-cloud-monitoring/noxfile.py",
419+
]
420+
before: '\n # Install all dependencies\n session.install\("-e", "\."\)'
421+
after: '\n # Install all dependencies\n session.install("-e", ".[pandas]")'
422+
count: 2
423+
- paths: [
424+
"packages/google-cloud-monitoring/testing/constraints-3.10.txt",
425+
]
426+
before: |
427+
google-api-core==2.17.1
428+
google-auth==2.14.1
429+
after: |
430+
google-api-core==2.17.1
431+
pandas==1.3.4
432+
numpy==1.21.3
433+
google-auth==2.14.1
434+
count: 1

‎.librarian/generator-input/client-post-processing/pubsub-integration.yaml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ replacements:
382382
- "packages/google-cloud-pubsub/setup.py"
383383
before: '([ \t]+)("grpc-google-iam-v1.*",\n)\]\nextras = \{\}'
384384
after: |-
385-
\g<1>\g<2>\g<1>"grpcio-status >= 1.44.0",
385+
\g<1>\g<2>\g<1>"grpcio-status >= 1.51.3",
386386
\g<1>"opentelemetry-api >= 1.27.0",
387387
\g<1>"opentelemetry-sdk >= 1.27.0",
388388
]
@@ -511,3 +511,27 @@ replacements:
511511
\g<1>"pubsub_v1/**",
512512
\g<1>"_build",
513513
count: 1
514+
515+
- paths:
516+
- "packages/google-cloud-pubsub/testing/constraints-3.10.txt"
517+
before: 'grpc-google-iam-v1==0\.14\.0\n(?!grpcio-status)'
518+
after: |-
519+
grpc-google-iam-v1==0.14.0
520+
grpcio-status==1.51.3
521+
opentelemetry-api==1.27.0
522+
opentelemetry-sdk==1.27.0
523+
count: 1
524+
525+
- paths:
526+
- "packages/google-cloud-pubsub/testing/constraints-3.10.txt"
527+
before: 'grpcio==1.44.0'
528+
after: 'grpcio==1.51.3'
529+
count: 1
530+
531+
- paths:
532+
- "packages/google-cloud-pubsub/setup.py"
533+
before: '"grpcio-status >= 1\.44\.0",'
534+
after: '"grpcio-status >= 1.51.3",'
535+
count: 1
536+
537+

‎.librarian/generator-input/client-post-processing/spanner-integration.yaml‎

Lines changed: 68 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,22 @@ replacements:
122122
\g<3>\g<4>
123123
count: 1
124124
- paths: [packages/google-cloud-spanner/setup.py]
125-
before: '(?s)dependencies = \[.*?\]\nextras = \{\}'
125+
before: '(?s)dependencies = \[.*?\]\nextras = \{\s*\}'
126126
after: |
127127
dependencies = [
128-
"google-api-core[grpc] >= 1.34.0, <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.*",
129-
"google-cloud-core >= 1.4.4, < 3.0.0",
128+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
129+
# Exclude incompatible versions of `google-auth`
130+
# See https://github.com/googleapis/google-cloud-python/issues/12364
131+
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
132+
"google-cloud-core >= 2.0.0, < 3.0.0",
133+
"grpcio >= 1.49.1, < 2.0.0",
134+
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
130135
"grpc-google-iam-v1 >= 0.12.4, <1.0.0",
131-
"proto-plus >= 1.22.0, <2.0.0",
132-
"sqlparse >= 0.4.4",
133-
"proto-plus >= 1.22.2, <2.0.0; python_version>='3.11'",
136+
"proto-plus >= 1.22.3, <2.0.0",
137+
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
134138
"protobuf >= 4.25.8, < 8.0.0",
135139
"grpc-interceptor >= 0.15.4",
140+
"sqlparse >= 0.4.4",
136141
# Make OpenTelemetry a core dependency
137142
"opentelemetry-api >= 1.22.0",
138143
"opentelemetry-sdk >= 1.22.0",
@@ -601,6 +606,40 @@ replacements:
601606
602607
Next Steps
603608
count: 1
609+
610+
- paths: [
611+
packages/google-cloud-spanner/README.rst
612+
]
613+
before: |
614+
Supported Python Versions
615+
\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^
616+
Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
617+
Python\.
618+
619+
Python >= 3\.9, including 3\.14
620+
621+
\.\. _active: https://devguide\.python\.org/devcycle/#in-development-main-branch
622+
\.\. _maintenance: https://devguide\.python\.org/devcycle/#maintenance-branches
623+
624+
Unsupported Python Versions
625+
\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^
626+
Python <= 3\.8
627+
after: |
628+
Supported Python Versions
629+
^^^^^^^^^^^^^^^^^^^^^^^^^
630+
Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
631+
Python.
632+
633+
Python >= 3.10, including 3.14
634+
635+
.. _active: https://devguide.python.org/devcycle/#in-development-main-branch
636+
.. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches
637+
638+
Unsupported Python Versions
639+
^^^^^^^^^^^^^^^^^^^^^^^^^^^
640+
Python <= 3.9
641+
count: 1
642+
604643
# Note: noxfile.py is heavily customized so we clobber the whole file.
605644
- paths: [
606645
packages/google-cloud-spanner/noxfile.py
@@ -627,7 +666,6 @@ replacements:
627666
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"]
628667
629668
ALL_PYTHON: List[str] = [
630-
"3.9",
631669
"3.10",
632670
"3.11",
633671
"3.12",
@@ -667,7 +705,6 @@ replacements:
667705
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
668706
669707
nox.options.sessions = [
670-
"unit-3.9",
671708
"unit-3.10",
672709
"unit-3.11",
673710
"unit-3.12",
@@ -816,8 +853,6 @@ replacements:
816853
def unit(session, protobuf_implementation):
817854
# Install all test dependencies, then install this package in-place.
818855
819-
if session.python in ("3.7",):
820-
session.skip("Python 3.7 is no longer supported")
821856
if protobuf_implementation == "cpp" and session.python in (
822857
"3.11",
823858
"3.12",
@@ -1379,4 +1414,27 @@ replacements:
13791414
)
13801415
def core_deps_from_source(session, protobuf_implementation):
13811416
"""Run all tests with core dependencies installed from source,
1417+
count: 1
1418+
- paths: [packages/google-cloud-spanner/testing/constraints-3.10.txt]
1419+
before: '(?s)protobuf==4.25.8\n(?!google-cloud-core)'
1420+
after: |
1421+
protobuf==4.25.8
1422+
google-cloud-core==2.0.0
1423+
grpc-google-iam-v1==0.12.4
1424+
sqlparse==0.4.4
1425+
grpc-interceptor==0.15.4
1426+
opentelemetry-api==1.22.0
1427+
opentelemetry-sdk==1.22.0
1428+
opentelemetry-semantic-conventions==0.43b0
1429+
opentelemetry-resourcedetector-gcp==1.8.0a0
1430+
google-cloud-monitoring==2.16.0
1431+
mmh3==4.1.0
1432+
libcst==0.2.5
1433+
googleapis-common-protos==1.60.0
1434+
count: 1
1435+
- paths: [packages/google-cloud-spanner/testing/constraints-3.10.txt]
1436+
before: 'grpcio==1\.44\.0\n(?!grpcio-status)'
1437+
after: |
1438+
grpcio==1.49.1
1439+
grpcio-status==1.49.1
13821440
count: 1

‎.librarian/generator-input/client-post-processing/storage-integration.yaml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,8 @@ replacements:
599599
"google-api-core[grpc] >= 2.27.0, < 3.0.0",
600600
"grpcio >= 1.44.0, < 2.0.0; python_version < '3.14'",
601601
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
602-
"grpcio-status >= 1.76.0, < 2.0.0",
602+
"grpcio-status >= 1.44.0, < 2.0.0; python_version < '3.14'",
603+
"grpcio-status >= 1.75.1, < 2.0.0; python_version >= '3.14'",
603604
"proto-plus >= 1.22.3, <2.0.0; python_version < '3.13'",
604605
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
605606
"protobuf >= 4.25.8, < 8.0.0",
@@ -636,23 +637,30 @@ replacements:
636637
}
637638
count: 1
638639
- paths: [
639-
packages/google-cloud-storage/testing/constraints-3.10.txt,
640+
packages/google-cloud-storage/testing/constraints-3.10.txt
640641
]
641642
before: |
642-
google-api-core[\s\S]*
643-
[\s\S]*?grpc-google-iam-v1[\s\S]*
643+
google-api-core==2.17.1
644+
google-auth==2.14.1
645+
grpcio==1.44.0
646+
proto-plus==1.22.3
647+
protobuf==4.25.8
648+
grpc-google-iam-v1==0.14.0
644649
after: |
645-
google-auth
650+
google-auth==2.26.1
646651
# cryptography is a direct dependency of google-auth
647-
cryptography
648-
google-api-core
649-
google-cloud-core
650-
google-resumable-media
651-
grpcio
652-
requests
653-
google-crc32c
654-
protobuf
655-
opentelemetry-api
652+
cryptography==38.0.0
653+
google-api-core==2.27.0
654+
google-cloud-core==2.4.2
655+
google-resumable-media==2.7.2
656+
grpcio==1.44.0
657+
grpcio-status==1.44.0
658+
proto-plus==1.22.3
659+
protobuf==4.25.8
660+
grpc-google-iam-v1==0.14.0
661+
opentelemetry-api==1.1.0
662+
requests==2.22.0
663+
google-crc32c==1.6.0
656664
count: 1
657665
- paths: [
658666
packages/google-cloud-storage/testing/constraints-3.11.txt,

‎.pre-commit-config.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
# See https://pre-commit.com/hooks.html for more hooks
1717
repos:
1818
- repo: https://github.com/pre-commit/pre-commit-hooks
19-
rev: v4.0.1
19+
rev: v6.0.0
2020
hooks:
2121
- id: trailing-whitespace
2222
- id: end-of-file-fixer
23-
- id: check-yaml
24-
- repo: https://github.com/psf/black
25-
rev: 22.3.0
26-
hooks:
27-
- id: black
28-
- repo: https://github.com/pycqa/flake8
29-
rev: 3.9.2 # version-scanner: ignore
30-
hooks:
31-
- id: flake8
23+
- repo: https://github.com/astral-sh/ruff-pre-commit
24+
# Ruff version.
25+
rev: v0.14.14
26+
hooks:
27+
# Run the linter.
28+
- id: ruff-check
29+
args: [ --select, I, --fix, --target-version=py310, --line-length=88 ]

‎librarian.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
language: python
15-
version: v0.13.0
15+
version: v0.14.0
1616
repo: googleapis/google-cloud-python
1717
sources:
1818
googleapis:
@@ -391,7 +391,6 @@ libraries:
391391
- path: google/cloud/asset/v1p5beta1
392392
- path: google/cloud/asset/v1p2beta1
393393
- path: google/cloud/asset/v1p1beta1
394-
skip_generate: true
395394
python:
396395
opt_args_by_api:
397396
google/cloud/asset/v1:
@@ -511,7 +510,6 @@ libraries:
511510
default_version: v1beta
512511
- name: google-cloud-bigquery
513512
version: 3.41.0
514-
skip_generate: true
515513
python:
516514
library_type: GAPIC_COMBO
517515
metadata_name_override: bigquery
@@ -1429,7 +1427,6 @@ libraries:
14291427
version: 2.30.0
14301428
apis:
14311429
- path: google/monitoring/v3
1432-
skip_generate: true
14331430
python:
14341431
library_type: GAPIC_COMBO
14351432
opt_args_by_api:
@@ -1909,7 +1906,6 @@ libraries:
19091906
- docs/spanner_v1/table.rst
19101907
- docs/spanner_v1/transaction.rst
19111908
- tests/unit/gapic/conftest.py
1912-
skip_generate: true
19131909
python:
19141910
library_type: GAPIC_COMBO
19151911
opt_args_by_api:
@@ -1938,8 +1934,6 @@ libraries:
19381934
version: 3.10.1
19391935
apis:
19401936
- path: google/storage/v2
1941-
skip_generate: true
1942-
skip_release: true
19431937
python:
19441938
library_type: GAPIC_MANUAL
19451939
opt_args_by_api:

‎packages/bigframes/bigframes/bigquery/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
import sys
4949

50-
from bigframes.bigquery import ai, ml, obj
50+
from bigframes.bigquery import aead, ai, ml, obj
5151
from bigframes.bigquery._operations.approx_agg import approx_top_count
5252
from bigframes.bigquery._operations.array import (
5353
array_agg,
@@ -208,6 +208,7 @@
208208
# io ops
209209
"load_data",
210210
# Modules / SQL namespaces
211+
"aead",
211212
"ai",
212213
"ml",
213214
"obj",

0 commit comments

Comments
 (0)