Skip to content

Commit aaec3ce

Browse files
chalmerlowechalmerlowe
authored
Merge branch 'main' into fix-bq-storage-client-deadlock
2 parents 8eebb9d + fddf2c5 commit aaec3ce

File tree

15 files changed

+193
-204
lines changed

15 files changed

+193
-204
lines changed

‎.github/.OwlBot.lock.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:5cddfe2fb5019bbf78335bc55f15bc13e18354a56b3ff46e1834f8e540807f05
17-
# created: 2024-10-31T01:41:07.349286254Z
16+
digest: sha256:2ed982f884312e4883e01b5ab8af8b6935f0216a5a2d82928d273081fc3be562
17+
# created: 2024-11-12T12:09:45.821174897Z

‎.github/release-trigger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
enabled: true
2-
multiScmName:
2+
multiScmName: python-bigquery

‎.kokoro/docker/docs/requirements.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.9
2+
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
55
# pip-compile --allow-unsafe --generate-hashes requirements.in
@@ -8,9 +8,9 @@ argcomplete==3.5.1 \
88
--hash=sha256:1a1d148bdaa3e3b93454900163403df41448a248af01b6e849edc5ac08e6c363 \
99
--hash=sha256:eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4
1010
# via nox
11-
colorlog==6.8.2 \
12-
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
13-
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
11+
colorlog==6.9.0 \
12+
--hash=sha256:5906e71acd67cb07a71e779c47c4bcb45fb8c2993eebe9e5adcd6a6f1b283eff \
13+
--hash=sha256:bfba54a1b93b94f54e1f4fe48395725a3d92fd2a4af702f6bd70946bdc0c6ac2
1414
# via nox
1515
distlib==0.3.9 \
1616
--hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
@@ -24,9 +24,9 @@ nox==2024.10.9 \
2424
--hash=sha256:1d36f309a0a2a853e9bccb76bbef6bb118ba92fa92674d15604ca99adeb29eab \
2525
--hash=sha256:7aa9dc8d1c27e9f45ab046ffd1c3b2c4f7c91755304769df231308849ebded95
2626
# via -r requirements.in
27-
packaging==24.1 \
28-
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
29-
--hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
27+
packaging==24.2 \
28+
--hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
29+
--hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
3030
# via nox
3131
platformdirs==4.3.6 \
3232
--hash=sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907 \
@@ -36,7 +36,7 @@ tomli==2.0.2 \
3636
--hash=sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38 \
3737
--hash=sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed
3838
# via nox
39-
virtualenv==20.26.6 \
40-
--hash=sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48 \
41-
--hash=sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2
39+
virtualenv==20.27.1 \
40+
--hash=sha256:142c6be10212543b32c6c45d3d3893dff89112cc588b7d0879ae5a1ec03a47ba \
41+
--hash=sha256:f11f1b8a29525562925f745563bfd48b189450f61fb34c4f9cc79dd5aa32a1f4
4242
# via nox

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
[1]: https://pypi.org/project/google-cloud-bigquery/#history
66

77

8+
## [3.27.0](https://github.com/googleapis/python-bigquery/compare/v3.26.0...v3.27.0) (2024-11-01)
9+
10+
11+
### Features
12+
13+
* Updates to allow users to set max_stream_count ([#2039](https://github.com/googleapis/python-bigquery/issues/2039)) ([7372ad6](https://github.com/googleapis/python-bigquery/commit/7372ad659fd3316a602e90f224e9a3304d4c1419))
14+
815
## [3.26.0](https://github.com/googleapis/python-bigquery/compare/v3.25.0...v3.26.0) (2024-09-25)
916

1017

‎google/cloud/bigquery/client.py

+41-41
Original file line numberDiff line numberDiff line change
@@ -1184,6 +1184,19 @@ def update_dataset(
11841184
must be provided. If a field is listed in ``fields`` and is ``None`` in
11851185
``dataset``, it will be deleted.
11861186
1187+
For example, to update the default expiration times, specify
1188+
both properties in the ``fields`` argument:
1189+
1190+
.. code-block:: python
1191+
1192+
bigquery_client.update_dataset(
1193+
dataset,
1194+
[
1195+
"default_partition_expiration_ms",
1196+
"default_table_expiration_ms",
1197+
]
1198+
)
1199+
11871200
If ``dataset.etag`` is not ``None``, the update will only
11881201
succeed if the dataset on the server has the same ETag. Thus
11891202
reading a dataset with ``get_dataset``, changing its fields,
@@ -1198,19 +1211,6 @@ def update_dataset(
11981211
The properties of ``dataset`` to change. These are strings
11991212
corresponding to the properties of
12001213
:class:`~google.cloud.bigquery.dataset.Dataset`.
1201-
1202-
For example, to update the default expiration times, specify
1203-
both properties in the ``fields`` argument:
1204-
1205-
.. code-block:: python
1206-
1207-
bigquery_client.update_dataset(
1208-
dataset,
1209-
[
1210-
"default_partition_expiration_ms",
1211-
"default_table_expiration_ms",
1212-
]
1213-
)
12141214
retry (Optional[google.api_core.retry.Retry]):
12151215
How to retry the RPC.
12161216
timeout (Optional[float]):
@@ -1254,6 +1254,15 @@ def update_model(
12541254
must be provided. If a field is listed in ``fields`` and is ``None``
12551255
in ``model``, the field value will be deleted.
12561256
1257+
For example, to update the descriptive properties of the model,
1258+
specify them in the ``fields`` argument:
1259+
1260+
.. code-block:: python
1261+
1262+
bigquery_client.update_model(
1263+
model, ["description", "friendly_name"]
1264+
)
1265+
12571266
If ``model.etag`` is not ``None``, the update will only succeed if
12581267
the model on the server has the same ETag. Thus reading a model with
12591268
``get_model``, changing its fields, and then passing it to
@@ -1266,15 +1275,6 @@ def update_model(
12661275
The properties of ``model`` to change. These are strings
12671276
corresponding to the properties of
12681277
:class:`~google.cloud.bigquery.model.Model`.
1269-
1270-
For example, to update the descriptive properties of the model,
1271-
specify them in the ``fields`` argument:
1272-
1273-
.. code-block:: python
1274-
1275-
bigquery_client.update_model(
1276-
model, ["description", "friendly_name"]
1277-
)
12781278
retry (Optional[google.api_core.retry.Retry]):
12791279
A description of how to retry the API call.
12801280
timeout (Optional[float]):
@@ -1318,6 +1318,15 @@ def update_routine(
13181318
must be provided. If a field is listed in ``fields`` and is ``None``
13191319
in ``routine``, the field value will be deleted.
13201320
1321+
For example, to update the description property of the routine,
1322+
specify it in the ``fields`` argument:
1323+
1324+
.. code-block:: python
1325+
1326+
bigquery_client.update_routine(
1327+
routine, ["description"]
1328+
)
1329+
13211330
.. warning::
13221331
During beta, partial updates are not supported. You must provide
13231332
all fields in the resource.
@@ -1336,15 +1345,6 @@ def update_routine(
13361345
fields (Sequence[str]):
13371346
The fields of ``routine`` to change, spelled as the
13381347
:class:`~google.cloud.bigquery.routine.Routine` properties.
1339-
1340-
For example, to update the description property of the routine,
1341-
specify it in the ``fields`` argument:
1342-
1343-
.. code-block:: python
1344-
1345-
bigquery_client.update_routine(
1346-
routine, ["description"]
1347-
)
13481348
retry (Optional[google.api_core.retry.Retry]):
13491349
A description of how to retry the API call.
13501350
timeout (Optional[float]):
@@ -1392,6 +1392,16 @@ def update_table(
13921392
must be provided. If a field is listed in ``fields`` and is ``None``
13931393
in ``table``, the field value will be deleted.
13941394
1395+
For example, to update the descriptive properties of the table,
1396+
specify them in the ``fields`` argument:
1397+
1398+
.. code-block:: python
1399+
1400+
bigquery_client.update_table(
1401+
table,
1402+
["description", "friendly_name"]
1403+
)
1404+
13951405
If ``table.etag`` is not ``None``, the update will only succeed if
13961406
the table on the server has the same ETag. Thus reading a table with
13971407
``get_table``, changing its fields, and then passing it to
@@ -1403,16 +1413,6 @@ def update_table(
14031413
fields (Sequence[str]):
14041414
The fields of ``table`` to change, spelled as the
14051415
:class:`~google.cloud.bigquery.table.Table` properties.
1406-
1407-
For example, to update the descriptive properties of the table,
1408-
specify them in the ``fields`` argument:
1409-
1410-
.. code-block:: python
1411-
1412-
bigquery_client.update_table(
1413-
table,
1414-
["description", "friendly_name"]
1415-
)
14161416
retry (Optional[google.api_core.retry.Retry]):
14171417
A description of how to retry the API call.
14181418
timeout (Optional[float]):

‎google/cloud/bigquery/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "3.26.0"
15+
__version__ = "3.27.0"

‎noxfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ def blacken(session):
462462
session.run("black", *BLACK_PATHS)
463463

464464

465-
@nox.session(python="3.9")
465+
@nox.session(python="3.10")
466466
@_calculate_duration
467467
def docs(session):
468468
"""Build the docs."""

‎pyproject.toml

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# Copyright 2024 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+
15+
[build-system]
16+
requires = ["setuptools"]
17+
build-backend = "setuptools.build_meta"
18+
19+
[project]
20+
name = "google-cloud-bigquery"
21+
authors = [{ name = "Google LLC", email = "[email protected]" }]
22+
license = { text = "Apache 2.0" }
23+
requires-python = ">=3.7"
24+
description = "Google BigQuery API client library"
25+
readme = "README.rst"
26+
classifiers = [
27+
# Should be one of:
28+
# "Development Status :: 3 - Alpha"
29+
# "Development Status :: 4 - Beta"
30+
# "Development Status :: 5 - Production/Stable"
31+
"Development Status :: 5 - Production/Stable",
32+
"Intended Audience :: Developers",
33+
"License :: OSI Approved :: Apache Software License",
34+
"Programming Language :: Python",
35+
"Programming Language :: Python :: 3",
36+
"Programming Language :: Python :: 3.7",
37+
"Programming Language :: Python :: 3.8",
38+
"Programming Language :: Python :: 3.9",
39+
"Programming Language :: Python :: 3.10",
40+
"Programming Language :: Python :: 3.11",
41+
"Programming Language :: Python :: 3.12",
42+
"Operating System :: OS Independent",
43+
"Topic :: Internet",
44+
]
45+
dependencies = [
46+
"google-api-core[grpc] >= 2.11.1, < 3.0.0dev",
47+
"google-auth >= 2.14.1, < 3.0.0dev",
48+
"google-cloud-core >= 2.4.1, < 3.0.0dev",
49+
"google-resumable-media >= 2.0.0, < 3.0dev",
50+
"packaging >= 20.0.0",
51+
"python-dateutil >= 2.7.3, < 3.0dev",
52+
"requests >= 2.21.0, < 3.0.0dev",
53+
]
54+
dynamic = ["version"]
55+
56+
[project.urls]
57+
Repository = "https://github.com/googleapis/python-bigquery"
58+
59+
[project.optional-dependencies]
60+
# bqstorage had a period where it was a required dependency, and has been
61+
# moved back to optional due to bloat. See
62+
# https://github.com/googleapis/python-bigquery/issues/1196 for more background.
63+
bqstorage = [
64+
"google-cloud-bigquery-storage >= 2.6.0, < 3.0.0dev",
65+
# Due to an issue in pip's dependency resolver, the `grpc` extra is not
66+
# installed, even though `google-cloud-bigquery-storage` specifies it
67+
# as `google-api-core[grpc]`. We thus need to explicitly specify it here.
68+
# See: https://github.com/googleapis/python-bigquery/issues/83 The
69+
# grpc.Channel.close() method isn't added until 1.32.0.
70+
# https://github.com/grpc/grpc/pull/15254
71+
"grpcio >= 1.47.0, < 2.0dev",
72+
"grpcio >= 1.49.1, < 2.0dev; python_version >= '3.11'",
73+
"pyarrow >= 3.0.0",
74+
]
75+
pandas = [
76+
"pandas >= 1.1.0",
77+
"pyarrow >= 3.0.0",
78+
"db-dtypes >= 0.3.0, < 2.0.0dev",
79+
"importlib_metadata >= 1.0.0; python_version < '3.8'",
80+
]
81+
ipywidgets = ["ipywidgets >= 7.7.0", "ipykernel >= 6.0.0"]
82+
geopandas = ["geopandas >= 0.9.0, < 2.0dev", "Shapely >= 1.8.4, < 3.0.0dev"]
83+
ipython = ["bigquery-magics >= 0.1.0"]
84+
tqdm = ["tqdm >= 4.7.4, < 5.0.0dev"]
85+
opentelemetry = [
86+
"opentelemetry-api >= 1.1.0",
87+
"opentelemetry-sdk >= 1.1.0",
88+
"opentelemetry-instrumentation >= 0.20b0",
89+
]
90+
bigquery_v2 = [
91+
"proto-plus >= 1.22.3, < 2.0.0dev",
92+
"protobuf >= 3.20.2, < 6.0.0dev, != 4.21.0, != 4.21.1, != 4.21.2, != 4.21.3, != 4.21.4, != 4.21.5", # For the legacy proto-based types.
93+
]
94+
all = [
95+
"google-cloud-bigquery[bqstorage,pandas,ipywidgets,geopandas,ipython,tqdm,opentelemetry,bigquery_v2]",
96+
]
97+
98+
[tool.setuptools.dynamic]
99+
version = { attr = "google.cloud.bigquery.version.__version__" }
100+
101+
[tool.setuptools.packages.find]
102+
# Only include packages under the 'google' namespace. Do not include tests,
103+
# benchmarks, etc.
104+
include = ["google*"]

‎samples/desktopapp/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-bigquery==3.26.0
1+
google-cloud-bigquery==3.27.0
22
google-auth-oauthlib==1.2.1

‎samples/geography/requirements.txt

+15-13
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,49 @@ attrs==24.2.0
22
certifi==2024.8.30
33
cffi===1.15.1; python_version == '3.7'
44
cffi==1.17.1; python_version >= '3.8'
5-
charset-normalizer==3.3.2
5+
charset-normalizer==3.4.0
66
click==8.1.7
77
click-plugins==1.1.1
88
cligj==0.7.2
99
dataclasses==0.8; python_version < '3.7'
10-
db-dtypes==1.3.0
10+
db-dtypes==1.3.1
1111
Fiona===1.9.6; python_version == '3.7'
1212
Fiona==1.10.1; python_version >= '3.8'
1313
geojson==3.1.0
1414
geopandas===0.10.2; python_version == '3.7'
1515
geopandas===0.13.2; python_version == '3.8'
1616
geopandas==1.0.1; python_version >= '3.9'
17-
google-api-core==2.20.0
18-
google-auth==2.35.0
19-
google-cloud-bigquery==3.26.0
20-
google-cloud-bigquery-storage==2.26.0
17+
google-api-core==2.23.0
18+
google-auth==2.36.0
19+
google-cloud-bigquery==3.27.0
20+
google-cloud-bigquery-storage==2.27.0
2121
google-cloud-core==2.4.1
2222
google-crc32c===1.5.0; python_version < '3.9'
2323
google-crc32c==1.6.0; python_version >= '3.9'
2424
google-resumable-media==2.7.2
25-
googleapis-common-protos==1.65.0
25+
googleapis-common-protos==1.66.0
2626
grpcio===1.62.2; python_version == '3.7'
27-
grpcio==1.66.1; python_version >= '3.8'
27+
grpcio==1.67.1; python_version >= '3.8'
2828
idna==3.10
2929
munch==4.0.0
3030
mypy-extensions==1.0.0
3131
packaging===24.0; python_version == '3.7'
32-
packaging==24.1; python_version >= '3.8'
32+
packaging==24.2; python_version >= '3.8'
3333
pandas===1.3.5; python_version == '3.7'
3434
pandas===2.0.3; python_version == '3.8'
3535
pandas==2.2.3; python_version >= '3.9'
36-
proto-plus==1.24.0
37-
pyarrow==12.0.1; python_version == '3.7'
38-
pyarrow==17.0.0; python_version >= '3.8'
36+
proto-plus==1.25.0
37+
pyarrow===12.0.1; python_version == '3.7'
38+
pyarrow===17.0.0; python_version == '3.8'
39+
pyarrow==18.0.0; python_version >= '3.9'
3940
pyasn1===0.5.1; python_version == '3.7'
4041
pyasn1==0.6.1; python_version >= '3.8'
4142
pyasn1-modules===0.3.0; python_version == '3.7'
4243
pyasn1-modules==0.4.1; python_version >= '3.8'
4344
pycparser===2.21; python_version == '3.7'
4445
pycparser==2.22; python_version >= '3.8'
45-
pyparsing==3.1.4
46+
pyparsing===3.1.4; python_version < '3.9'
47+
pyparsing==3.2.0; python_version >= '3.9'
4648
python-dateutil==2.9.0.post0
4749
pytz==2024.2
4850
PyYAML===6.0.1; python_version == '3.7'

0 commit comments

Comments
 (0)