Skip to content

Commit a752034

Browse files
committed
Merge branch 'main' into shuowei-gbq-task-8a-readrowspage-arrow
2 parents fa01f45 + bc38644 commit a752034

76 files changed

Lines changed: 659 additions & 292 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/gapic-generator-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
env:
1616
SHOWCASE_VERSION: 0.35.0
17-
PROTOC_VERSION: 3.20.2
17+
PROTOC_VERSION: 33.5
1818
LATEST_STABLE_PYTHON: 3.14
1919
PRERELEASE_PYTHON: 3.15
2020
ALL_PYTHON: "['3.10', '3.11', '3.12', '3.13', '3.14', '3.15']"

.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ replacements:
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
33-
"google-cloud-common >= 1.0.0, <2.0.0",
33+
"google-cloud-common >= 1.5.1, <2.0.0",
3434
"grpcio >= 1.59.0, < 2.0.0",
3535
count: 1

.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ replacements:
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
33-
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
33+
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
3434
"grpcio >= 1.59.0, < 2.0.0",
3535
count: 1
3636
- paths: [
@@ -49,7 +49,7 @@ replacements:
4949
# Exclude incompatible versions of `google-auth`
5050
# See https://github.com/googleapis/google-cloud-python/issues/12364
5151
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
52-
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
52+
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
5353
"grpcio >= 1.59.0, < 2.0.0",
5454
count: 1
5555
- paths: [
@@ -68,7 +68,7 @@ replacements:
6868
# Exclude incompatible versions of `google-auth`
6969
# See https://github.com/googleapis/google-cloud-python/issues/12364
7070
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
71-
"grafeas >= 1.7.0, <2.0",
71+
"grafeas >= 1.14.1, <2.0",
7272
"grpcio >= 1.59.0, < 2.0.0",
7373
count: 1
7474
- paths: [
@@ -87,7 +87,7 @@ replacements:
8787
# Exclude incompatible versions of `google-auth`
8888
# See https://github.com/googleapis/google-cloud-python/issues/12364
8989
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
90-
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
90+
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
9191
"grpcio >= 1.59.0, < 2.0.0",
9292
count: 1
9393
- paths: [

.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ replacements:
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
33-
"grafeas >=1.7.0, <2.0",
33+
"grafeas >=1.14.1, <2.0",
3434
"grpcio >= 1.59.0, < 2.0.0",
3535
count: 1
3636
- paths: [

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ replacements:
4141
"grpcio >= 1.59.0, < 2.0.0",
4242
after: |
4343
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
44-
"google-cloud-appengine-logging>=0.1.3, <2.0.0",
44+
"google-cloud-appengine-logging>=1.6.1, <2.0.0",
4545
"google-cloud-audit-log >= 0.3.2, < 1.0.0",
4646
"google-cloud-core >= 2.0.0, <3.0.0",
4747
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
@@ -56,7 +56,7 @@ replacements:
5656
grpcio==1.59.0
5757
after: |
5858
google-auth==2.14.1
59-
google-cloud-appengine-logging==0.1.3
59+
google-cloud-appengine-logging==1.6.1
6060
google-cloud-audit-log==0.3.2
6161
google-cloud-core==2.0.0
6262
grpc-google-iam-v1==0.14.2

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -601,12 +601,11 @@ replacements:
601601
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
602602
"grpcio-status >= 1.59.0, < 2.0.0",
603603
"grpcio-status >= 1.75.1, < 2.0.0; python_version >= '3.14'",
604-
"proto-plus >= 1.22.3, <2.0.0; python_version < '3.13'",
605-
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
606-
"protobuf >= 4.25.8, < 8.0.0",
607-
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
604+
"proto-plus >= 1.26.1, <2.0.0",
605+
"protobuf >= 6.33.5, < 8.0.0",
606+
"grpc-google-iam-v1 >= 0.14.2, <1.0.0",
608607
],
609-
"protobuf": ["protobuf >= 3.20.2, < 7.0.0"],
608+
"protobuf": ["protobuf >= 6.33.5, < 8.0.0"],
610609
"tracing": [
611610
"opentelemetry-api >= 1.1.0, < 2.0.0",
612611
],
@@ -655,9 +654,9 @@ replacements:
655654
google-resumable-media==2.7.2
656655
grpcio==1.59.0
657656
grpcio-status==1.59.0
658-
proto-plus==1.22.3
659-
protobuf==4.25.8
660-
grpc-google-iam-v1==0.14.0
657+
proto-plus==1.26.1
658+
protobuf==6.33.5
659+
grpc-google-iam-v1==0.14.2
661660
opentelemetry-api==1.1.0
662661
requests==2.22.0
663662
google-crc32c==1.6.0

.release-please-bulk-manifest.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"packages/google-cloud-beyondcorp-clientgateways": "0.8.0",
5555
"packages/google-cloud-biglake": "0.5.0",
5656
"packages/google-cloud-biglake-hive": "0.3.1",
57-
"packages/google-cloud-bigquery": "3.42.2",
5857
"packages/google-cloud-bigquery-analyticshub": "0.9.0",
5958
"packages/google-cloud-bigquery-biglake": "0.8.0",
6059
"packages/google-cloud-bigquery-connection": "1.22.0",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"packages/bigframes": "2.46.0",
3+
"packages/google-cloud-bigquery": "3.42.3",
34
"packages/google-crc32c": "1.8.0",
45
"packages/pandas-gbq": "0.35.0"
56
}

librarian.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ libraries:
559559
python:
560560
default_version: v1beta
561561
- name: google-cloud-bigquery
562-
version: 3.42.2
562+
version: 3.42.3
563563
python:
564564
library_type: GAPIC_COMBO
565565
metadata_name_override: bigquery

packages/bigframes/setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"google-cloud-bigquery[bqstorage,pandas] >=3.36.0",
4343
# 2.30 needed for arrow support.
4444
"google-cloud-bigquery-storage >= 2.30.0, < 3.0.0",
45-
"google-cloud-functions >=1.12.0",
46-
"google-cloud-bigquery-connection >=1.12.0",
47-
"google-cloud-resource-manager >=1.10.3",
45+
"google-cloud-functions >=1.20.2",
46+
"google-cloud-bigquery-connection >=1.18.2",
47+
"google-cloud-resource-manager >=1.14.2",
4848
"google-cloud-storage >=2.0.0",
4949
"google-crc32c >=1.0.0,<2.0.0",
5050
"grpc-google-iam-v1 >= 0.14.2",
@@ -73,8 +73,8 @@
7373
"tests": [
7474
"freezegun",
7575
"pytest-snapshot",
76-
"google-cloud-bigtable >=2.24.0",
77-
"google-cloud-pubsub >=2.21.4",
76+
"google-cloud-bigtable >=2.30.0",
77+
"google-cloud-pubsub >=2.29.0",
7878
"tzdata",
7979
],
8080
# used for local engine

0 commit comments

Comments
 (0)