google-cloud-bigquery 3.42.2__tar.gz → 3.42.3__tar.gz

{google_cloud_bigquery-3.42.2/google_cloud_bigquery.egg-info → google_cloud_bigquery-3.42.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-bigquery
-Version: 3.42.2
+Version: 3.42.3
 Summary: Google BigQuery API client library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0
@@ -27,16 +27,14 @@ Requires-Dist: packaging>=24.2.0
 Requires-Dist: python-dateutil<3.0.0,>=2.8.2
 Requires-Dist: requests<3.0.0,>=2.21.0
 Provides-Extra: bqstorage
-Requires-Dist: google-cloud-bigquery-storage<3.0.0,>=2.18.0; extra == "bqstorage"
-Requires-Dist: grpcio<2.0.0,>=1.47.0; extra == "bqstorage"
-Requires-Dist: grpcio<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "bqstorage"
+Requires-Dist: google-cloud-bigquery-storage<3.0.0,>=2.29.0; extra == "bqstorage"
+Requires-Dist: grpcio<2.0.0,>=1.59.0; extra == "bqstorage"
 Requires-Dist: grpcio<2.0.0,>=1.75.1; python_version >= "3.14" and extra == "bqstorage"
 Requires-Dist: pyarrow>=4.0.0; extra == "bqstorage"
 Provides-Extra: pandas
 Requires-Dist: pandas>=1.3.0; extra == "pandas"
 Requires-Dist: pandas-gbq>=0.26.1; extra == "pandas"
-Requires-Dist: grpcio<2.0.0,>=1.47.0; extra == "pandas"
-Requires-Dist: grpcio<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "pandas"
+Requires-Dist: grpcio<2.0.0,>=1.59.0; extra == "pandas"
 Requires-Dist: grpcio<2.0.0,>=1.75.1; python_version >= "3.14" and extra == "pandas"
 Requires-Dist: pyarrow>=3.0.0; extra == "pandas"
 Requires-Dist: db-dtypes<2.0.0,>=1.0.4; extra == "pandas"
@@ -58,8 +56,8 @@ Requires-Dist: opentelemetry-api>=1.1.0; extra == "opentelemetry"
 Requires-Dist: opentelemetry-sdk>=1.1.0; extra == "opentelemetry"
 Requires-Dist: opentelemetry-instrumentation>=0.20b0; extra == "opentelemetry"
 Provides-Extra: bigquery-v2
-Requires-Dist: proto-plus<2.0.0,>=1.22.3; extra == "bigquery-v2"
-Requires-Dist: protobuf!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<7.0.0,>=3.20.2; extra == "bigquery-v2"
+Requires-Dist: proto-plus<2.0.0,>=1.26.1; extra == "bigquery-v2"
+Requires-Dist: protobuf<8.0.0,>=6.33.5; extra == "bigquery-v2"
 Provides-Extra: all
 Requires-Dist: google-cloud-bigquery[bigquery_v2,bqstorage,geopandas,ipython,ipywidgets,matplotlib,opentelemetry,pandas,tqdm]; extra == "all"
 Dynamic: license-file

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/google/cloud/bigquery/dbapi/connection.py

@@ -17,8 +17,7 @@
 import weakref
 
 from google.cloud import bigquery
-from google.cloud.bigquery.dbapi import cursor
-from google.cloud.bigquery.dbapi import _helpers
+from google.cloud.bigquery.dbapi import _helpers, cursor
 
 
 @_helpers.raise_on_closed("Operating on a closed connection.")
@@ -84,7 +83,17 @@ class Connection(object):
 
         if self._owns_bqstorage_client:
             # There is no close() on the BQ Storage client itself.
-            self._bqstorage_client._transport.close()
+            transport = self._bqstorage_client.transport
+            transport.close()
+
+            # Ensure the underlying gRPC channel is closed explicitly.
+            # This is important because the transport might be wrapped by interceptors
+            # which may not propagate the close call to the underlying channel immediately,
+            # or Garbage Collection delays might keep sockets open longer than expected,
+            # leading to intermittent socket leaks in tests.
+            channel = getattr(transport, "_grpc_channel", None)
+            if channel is not None:
+                channel.close()
 
         for cursor_ in self._cursors_created:
             if not cursor_._closed:

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/google/cloud/bigquery/dbapi/cursor.py

@@ -17,8 +17,8 @@
 from __future__ import annotations
 
 import collections
-from collections import abc as collections_abc
 import re
+from collections import abc as collections_abc
 from typing import Optional
 
 try:
@@ -29,11 +29,9 @@ else:
     # Having BQ Storage available implies that pyarrow >=1.0.0 is available, too.
     _ARROW_COMPRESSION_SUPPORT = True
 
-from google.cloud.bigquery import job
-from google.cloud.bigquery.dbapi import _helpers
-from google.cloud.bigquery.dbapi import exceptions
 import google.cloud.exceptions  # type: ignore
-
+from google.cloud.bigquery import job
+from google.cloud.bigquery.dbapi import _helpers, exceptions
 
 # Per PEP 249: A 7-item sequence containing information describing one result
 # column. The first two items (name and type_code) are mandatory, the other
@@ -105,6 +103,15 @@ class Cursor(object):
         """Mark the cursor as closed, preventing its further use."""
         self._closed = True
 
+        # Explicitly release references to query data and rows.
+        # This is important because these objects may hold references to underlying
+        # transports or gRPC streams (especially when using BQ Storage API).
+        # Clearing them ensures that resources can be garbage collected deterministically,
+        # preventing intermittent socket leaks (e.g., ESTABLISHED connections) in tests
+        # and long-running applications.
+        self._query_data = None
+        self._query_rows = None
+
     def _set_description(self, schema):
         """Set description from schema.
 

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/google/cloud/bigquery/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.42.2"
+__version__ = "3.42.3"

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3/google_cloud_bigquery.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-bigquery
-Version: 3.42.2
+Version: 3.42.3
 Summary: Google BigQuery API client library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0
@@ -27,16 +27,14 @@ Requires-Dist: packaging>=24.2.0
 Requires-Dist: python-dateutil<3.0.0,>=2.8.2
 Requires-Dist: requests<3.0.0,>=2.21.0
 Provides-Extra: bqstorage
-Requires-Dist: google-cloud-bigquery-storage<3.0.0,>=2.18.0; extra == "bqstorage"
-Requires-Dist: grpcio<2.0.0,>=1.47.0; extra == "bqstorage"
-Requires-Dist: grpcio<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "bqstorage"
+Requires-Dist: google-cloud-bigquery-storage<3.0.0,>=2.29.0; extra == "bqstorage"
+Requires-Dist: grpcio<2.0.0,>=1.59.0; extra == "bqstorage"
 Requires-Dist: grpcio<2.0.0,>=1.75.1; python_version >= "3.14" and extra == "bqstorage"
 Requires-Dist: pyarrow>=4.0.0; extra == "bqstorage"
 Provides-Extra: pandas
 Requires-Dist: pandas>=1.3.0; extra == "pandas"
 Requires-Dist: pandas-gbq>=0.26.1; extra == "pandas"
-Requires-Dist: grpcio<2.0.0,>=1.47.0; extra == "pandas"
-Requires-Dist: grpcio<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "pandas"
+Requires-Dist: grpcio<2.0.0,>=1.59.0; extra == "pandas"
 Requires-Dist: grpcio<2.0.0,>=1.75.1; python_version >= "3.14" and extra == "pandas"
 Requires-Dist: pyarrow>=3.0.0; extra == "pandas"
 Requires-Dist: db-dtypes<2.0.0,>=1.0.4; extra == "pandas"
@@ -58,8 +56,8 @@ Requires-Dist: opentelemetry-api>=1.1.0; extra == "opentelemetry"
 Requires-Dist: opentelemetry-sdk>=1.1.0; extra == "opentelemetry"
 Requires-Dist: opentelemetry-instrumentation>=0.20b0; extra == "opentelemetry"
 Provides-Extra: bigquery-v2
-Requires-Dist: proto-plus<2.0.0,>=1.22.3; extra == "bigquery-v2"
-Requires-Dist: protobuf!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<7.0.0,>=3.20.2; extra == "bigquery-v2"
+Requires-Dist: proto-plus<2.0.0,>=1.26.1; extra == "bigquery-v2"
+Requires-Dist: protobuf<8.0.0,>=6.33.5; extra == "bigquery-v2"
 Provides-Extra: all
 Requires-Dist: google-cloud-bigquery[bigquery_v2,bqstorage,geopandas,ipython,ipywidgets,matplotlib,opentelemetry,pandas,tqdm]; extra == "all"
 Dynamic: license-file

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/google_cloud_bigquery.egg-info/requires.txt

@@ -10,17 +10,14 @@ requests<3.0.0,>=2.21.0
 google-cloud-bigquery[bigquery_v2,bqstorage,geopandas,ipython,ipywidgets,matplotlib,opentelemetry,pandas,tqdm]
 
 [bigquery_v2]
-proto-plus<2.0.0,>=1.22.3
-protobuf!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<7.0.0,>=3.20.2
+proto-plus<2.0.0,>=1.26.1
+protobuf<8.0.0,>=6.33.5
 
 [bqstorage]
-google-cloud-bigquery-storage<3.0.0,>=2.18.0
-grpcio<2.0.0,>=1.47.0
+google-cloud-bigquery-storage<3.0.0,>=2.29.0
+grpcio<2.0.0,>=1.59.0
 pyarrow>=4.0.0
 
-[bqstorage:python_version >= "3.11"]
-grpcio<2.0.0,>=1.49.1
-
 [bqstorage:python_version >= "3.14"]
 grpcio<2.0.0,>=1.75.1
 
@@ -47,13 +44,10 @@ opentelemetry-instrumentation>=0.20b0
 [pandas]
 pandas>=1.3.0
 pandas-gbq>=0.26.1
-grpcio<2.0.0,>=1.47.0
+grpcio<2.0.0,>=1.59.0
 pyarrow>=3.0.0
 db-dtypes<2.0.0,>=1.0.4
 
-[pandas:python_version >= "3.11"]
-grpcio<2.0.0,>=1.49.1
-
 [pandas:python_version >= "3.14"]
 grpcio<2.0.0,>=1.75.1
 

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/pyproject.toml

@@ -59,23 +59,21 @@ Repository = "https://github.com/googleapis/python-bigquery"
 # moved back to optional due to bloat.  See
 # https://github.com/googleapis/python-bigquery/issues/1196 for more background.
 bqstorage = [
-  "google-cloud-bigquery-storage >= 2.18.0, < 3.0.0",
+  "google-cloud-bigquery-storage >= 2.29.0, < 3.0.0",
   # Due to an issue in pip's dependency resolver, the `grpc` extra is not
   # installed, even though `google-cloud-bigquery-storage` specifies it
   # as `google-api-core[grpc]`. We thus need to explicitly specify it here.
   # See: https://github.com/googleapis/python-bigquery/issues/83 The
   # grpc.Channel.close() method isn't added until 1.32.0.
   # https://github.com/grpc/grpc/pull/15254
-  "grpcio >= 1.47.0, < 2.0.0",
-  "grpcio >= 1.49.1, < 2.0.0; python_version >= '3.11'",
+  "grpcio >= 1.59.0, < 2.0.0",
   "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
   "pyarrow >= 4.0.0",
 ]
 pandas = [
   "pandas >= 1.3.0",
   "pandas-gbq >= 0.26.1",
-  "grpcio >= 1.47.0, < 2.0.0",
-  "grpcio >= 1.49.1, < 2.0.0; python_version >= '3.11'",
+  "grpcio >= 1.59.0, < 2.0.0",
   "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
   "pyarrow >= 3.0.0",
   "db-dtypes >= 1.0.4, < 2.0.0",
@@ -93,8 +91,8 @@ opentelemetry = [
   "opentelemetry-instrumentation >= 0.20b0",
 ]
 bigquery_v2 = [
-  "proto-plus >= 1.22.3, < 2.0.0",
-  "protobuf >= 3.20.2, < 7.0.0, != 4.21.0, != 4.21.1, != 4.21.2, != 4.21.3, != 4.21.4, != 4.21.5", # For the legacy proto-based types.
+  "proto-plus >= 1.26.1, < 2.0.0",
+  "protobuf >= 6.33.5, < 8.0.0", # For the legacy proto-based types.
 ]
 all = [
   "google-cloud-bigquery[bqstorage,pandas,ipywidgets,geopandas,ipython,matplotlib,tqdm,opentelemetry,bigquery_v2]",

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/tests/system/test_client.py

@@ -22,38 +22,36 @@ import json
 import operator
 import os
 import pathlib
+import random
+import string
 import time
 import unittest
 import uuid
-import random
-import string
 from typing import Optional
 
-from google.api_core.exceptions import PreconditionFailed
-from google.api_core.exceptions import BadRequest
-from google.api_core.exceptions import ClientError
-from google.api_core.exceptions import Conflict
-from google.api_core.exceptions import GoogleAPICallError
-from google.api_core.exceptions import NotFound
-from google.api_core.exceptions import InternalServerError
-from google.api_core.exceptions import ServiceUnavailable
-from google.api_core.exceptions import TooManyRequests
-from google.cloud import bigquery
-from google.cloud.bigquery.dataset import Dataset
-from google.cloud.bigquery.dataset import DatasetReference
-from google.cloud.bigquery.table import Table
+import psutil
+import pytest
+from google.api_core.exceptions import (
+    BadRequest,
+    ClientError,
+    Conflict,
+    GoogleAPICallError,
+    InternalServerError,
+    NotFound,
+    PreconditionFailed,
+    ServiceUnavailable,
+    TooManyRequests,
+)
+from google.cloud import bigquery, storage
 from google.cloud._helpers import UTC
 from google.cloud.bigquery import dbapi, enums
-from google.cloud import storage
-from google.cloud.datacatalog_v1 import types as datacatalog_types
+from google.cloud.bigquery.dataset import Dataset, DatasetReference
+from google.cloud.bigquery.table import Table
 from google.cloud.datacatalog_v1 import PolicyTagManagerClient
-from google.cloud.resourcemanager_v3 import types as resourcemanager_types
+from google.cloud.datacatalog_v1 import types as datacatalog_types
 from google.cloud.resourcemanager_v3 import TagKeysClient, TagValuesClient
-import psutil
-import pytest
-from test_utils.retry import RetryErrors
-from test_utils.retry import RetryInstanceState
-from test_utils.retry import RetryResult
+from google.cloud.resourcemanager_v3 import types as resourcemanager_types
+from test_utils.retry import RetryErrors, RetryInstanceState, RetryResult
 from test_utils.system import unique_resource_id
 
 from . import helpers
@@ -254,8 +252,13 @@ class TestBigQuery(unittest.TestCase):
         import gc
 
         gc.collect()
-        conn_end = current_process.net_connections()
-        conn_count_end = len(conn_end)
+        for _ in range(30):  # Wait up to 3 seconds
+            conn_end = current_process.net_connections()
+            conn_count_end = len(conn_end)
+            if conn_count_end <= conn_count_start:
+                break
+            time.sleep(0.1)
+
         self.assertLessEqual(conn_count_end, conn_count_start)
 
     def test_create_dataset(self):
@@ -635,8 +638,7 @@ class TestBigQuery(unittest.TestCase):
         self.assertEqual("FOO", row_2.get("username"))
 
     def test_create_table_w_time_partitioning_w_clustering_fields(self):
-        from google.cloud.bigquery.table import TimePartitioning
-        from google.cloud.bigquery.table import TimePartitioningType
+        from google.cloud.bigquery.table import TimePartitioning, TimePartitioningType
 
         dataset = self.temp_dataset(_make_dataset_id("create_table_tp_cf"))
         table_id = "test_table"
@@ -964,12 +966,12 @@ class TestBigQuery(unittest.TestCase):
         self.assertIsNone(table3.clustering_fields, None)
 
     def test_update_table_constraints(self):
-        from google.cloud.bigquery.table import TableConstraints
         from google.cloud.bigquery.table import (
-            PrimaryKey,
+            ColumnReference,
             ForeignKey,
+            PrimaryKey,
+            TableConstraints,
             TableReference,
-            ColumnReference,
         )
 
         dataset = self.temp_dataset(_make_dataset_id("update_table"))
@@ -1128,8 +1130,7 @@ class TestBigQuery(unittest.TestCase):
         self.assertEqual(sorted(row_tuples, key=by_age), sorted(ROWS, key=by_age))
 
     def test_load_table_from_local_avro_file_then_dump_table(self):
-        from google.cloud.bigquery.job import SourceFormat
-        from google.cloud.bigquery.job import WriteDisposition
+        from google.cloud.bigquery.job import SourceFormat, WriteDisposition
 
         TABLE_NAME = "test_table_avro"
         ROWS = [
@@ -1169,8 +1170,7 @@ class TestBigQuery(unittest.TestCase):
 
     def test_load_table_from_local_parquet_file_decimal_types(self):
         from google.cloud.bigquery.enums import DecimalTargetType
-        from google.cloud.bigquery.job import SourceFormat
-        from google.cloud.bigquery.job import WriteDisposition
+        from google.cloud.bigquery.job import SourceFormat, WriteDisposition
 
         TABLE_NAME = "test_table_parquet"
 
@@ -1359,9 +1359,11 @@ class TestBigQuery(unittest.TestCase):
         self.assertEqual(table.num_rows, 3)
 
     def test_load_avro_from_uri_then_dump_table(self):
-        from google.cloud.bigquery.job import CreateDisposition
-        from google.cloud.bigquery.job import SourceFormat
-        from google.cloud.bigquery.job import WriteDisposition
+        from google.cloud.bigquery.job import (
+            CreateDisposition,
+            SourceFormat,
+            WriteDisposition,
+        )
 
         table_name = "test_table"
         rows = [
@@ -1399,9 +1401,11 @@ class TestBigQuery(unittest.TestCase):
         )
 
     def test_load_table_from_uri_then_dump_table(self):
-        from google.cloud.bigquery.job import CreateDisposition
-        from google.cloud.bigquery.job import SourceFormat
-        from google.cloud.bigquery.job import WriteDisposition
+        from google.cloud.bigquery.job import (
+            CreateDisposition,
+            SourceFormat,
+            WriteDisposition,
+        )
 
         TABLE_ID = "test_table"
         GS_URL = self._write_csv_to_storage(
@@ -2202,15 +2206,41 @@ class TestBigQuery(unittest.TestCase):
         import gc
 
         gc.collect()
-        conn_end = current_process.net_connections()
-        conn_count_end = len(conn_end)
-        self.assertLessEqual(conn_count_end, conn_count_start)
+        for _ in range(30):  # Wait up to 3 seconds
+            conn_end = current_process.net_connections()
+            conn_count_end = len(conn_end)
+            if conn_count_end <= conn_count_start:
+                break
+            time.sleep(0.1)
+
+        try:
+            self.assertLessEqual(conn_count_end, conn_count_start)
+        except AssertionError as e:
+            # Due to flakiness in this test (likely caused by OS cleanup delays or
+            # non-deterministic garbage collection of sockets), we want to capture
+            # the detailed state of connections in future failing runs to help
+            # decrease false positives and identify the root cause.
+            conn_debug = [
+                f"Status: {c.status}, Laddr: {c.laddr}, Raddr: {c.raddr}"
+                for c in current_process.net_connections()
+            ]
+            debug_msg = "\n".join(conn_debug)
+
+            raise AssertionError(
+                f"{e}\n\n"
+                f"--- Socket Leak Debug Info ---\n"
+                f"Start Count: {conn_count_start}\n"
+                f"End Count: {conn_count_end}\n"
+                f"Current Connections:\n{debug_msg}"
+            )
 
     def _load_table_for_dml(self, rows, dataset_id, table_id):
         from google.cloud._testing import _NamedTemporaryFile
-        from google.cloud.bigquery.job import CreateDisposition
-        from google.cloud.bigquery.job import SourceFormat
-        from google.cloud.bigquery.job import WriteDisposition
+        from google.cloud.bigquery.job import (
+            CreateDisposition,
+            SourceFormat,
+            WriteDisposition,
+        )
 
         dataset = self.temp_dataset(dataset_id)
         greeting = bigquery.SchemaField("greeting", "STRING", mode="NULLABLE")
@@ -2732,8 +2762,7 @@ class TestBigQuery(unittest.TestCase):
         bigquery_storage = pytest.importorskip("google.cloud.bigquery_storage")
         pyarrow = pytest.importorskip("pyarrow")
         pyarrow.types = pytest.importorskip("pyarrow.types")
-        from google.cloud.bigquery.job import SourceFormat
-        from google.cloud.bigquery.job import WriteDisposition
+        from google.cloud.bigquery.job import SourceFormat, WriteDisposition
 
         SF = bigquery.SchemaField
         schema = [
@@ -2865,8 +2894,7 @@ def test_parameterized_types_round_trip(dataset_id: str):
 
 
 def test_table_snapshots(dataset_id: str):
-    from google.cloud.bigquery import CopyJobConfig
-    from google.cloud.bigquery import OperationType
+    from google.cloud.bigquery import CopyJobConfig, OperationType
 
     client = Config.CLIENT
 
@@ -2936,8 +2964,7 @@ def test_table_snapshots(dataset_id: str):
 
 
 def test_table_clones(dataset_id: str):
-    from google.cloud.bigquery import CopyJobConfig
-    from google.cloud.bigquery import OperationType
+    from google.cloud.bigquery import CopyJobConfig, OperationType
 
     client = Config.CLIENT
 

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/tests/system/test_magics.py

@@ -15,9 +15,10 @@
 """System tests for Jupyter/IPython connector."""
 
 import re
+import time
 
-import pytest
 import psutil
+import pytest
 
 from . import helpers
 
@@ -71,8 +72,16 @@ def test_bigquery_magic(ipython_interactive):
         with io.capture_output() as captured:
             result = ip.run_cell_magic("bigquery", "--use_rest_api", sql)
 
-    conn_end = current_process.net_connections()
-    conn_count_end = len(conn_end)
+    import gc
+
+    gc.collect()
+
+    for _ in range(30):  # Wait up to 3 seconds
+        conn_end = current_process.net_connections()
+        conn_count_end = len(conn_end)
+        if conn_count_end <= conn_count_start:
+            break
+        time.sleep(0.1)
 
     lines = re.split("\n|\r", captured.stdout)
     # Removes blanks & terminal code (result of display clearing)

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/tests/unit/job/test_async_job_retry.py

@@ -15,11 +15,10 @@
 from unittest import mock
 
 import google.api_core.retry
+import google.cloud.bigquery.job
 from google.api_core import exceptions
 
 from . import helpers
-import google.cloud.bigquery.job
-
 
 PROJECT = "test-project"
 JOB_ID = "test-job-id"
@@ -110,7 +109,7 @@ def test_result_w_retry_wo_state(global_time_lock):
         predicate=custom_predicate,
         initial=0.001,
         maximum=0.001,
-        deadline=0.1,
+        deadline=1.0,
     )
     assert job.result(retry=custom_retry) is job
 

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/tests/unit/job/test_query_job_retry.py

@@ -11,14 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import concurrent.futures
 from unittest import mock
 
-import concurrent.futures
 import freezegun
-from google.api_core import exceptions
 import google.api_core.retry
 import pytest
-
+from google.api_core import exceptions
 from google.cloud.bigquery.client import _MIN_GET_QUERY_RESULTS_TIMEOUT
 from google.cloud.bigquery.job import QueryJob
 from google.cloud.bigquery.retry import DEFAULT_GET_JOB_TIMEOUT
@@ -27,7 +26,6 @@ from google.cloud.bigquery.table import RowIterator
 from ..helpers import make_connection
 from .helpers import _make_client
 
-
 PROJECT = "test-project"
 JOB_ID = "test-job-id"
 QUERY = "select count(*) from persons"
@@ -105,7 +103,7 @@ def test_result_w_custom_retry(global_time_lock):
         initial=0.001,
         maximum=0.001,
         multiplier=1.0,
-        deadline=0.1,
+        deadline=1.0,
         predicate=custom_predicate,
     )
 

{google_cloud_bigquery-3.42.2 → google_cloud_bigquery-3.42.3}/tests/unit/test_dbapi_connection.py

@@ -13,10 +13,11 @@
 #  limitations under the License.
 
 import gc
-import pytest
 import unittest
 from unittest import mock
 
+import pytest
+
 
 class TestConnection(unittest.TestCase):
     @staticmethod
@@ -40,8 +41,8 @@ class TestConnection(unittest.TestCase):
         from google.cloud import bigquery_storage
 
         mock_client = mock.create_autospec(bigquery_storage.BigQueryReadClient)
-        mock_client._transport = mock.Mock(spec=["channel", "close"])
-        mock_client._transport.grpc_channel = mock.Mock(spec=["close"])
+        mock_client.transport.close = mock.Mock()
+        mock_client.transport._grpc_channel = mock.Mock(spec=["close"])
         return mock_client
 
     def test_ctor_wo_bqstorage_client(self):
@@ -77,8 +78,7 @@ class TestConnection(unittest.TestCase):
 
     @mock.patch("google.cloud.bigquery.Client", autospec=True)
     def test_connect_wo_client(self, mock_client):
-        from google.cloud.bigquery.dbapi import connect
-        from google.cloud.bigquery.dbapi import Connection
+        from google.cloud.bigquery.dbapi import Connection, connect
 
         connection = connect()
         self.assertIsInstance(connection, Connection)
@@ -87,8 +87,7 @@ class TestConnection(unittest.TestCase):
 
     def test_connect_w_client(self):
         pytest.importorskip("google.cloud.bigquery_storage")
-        from google.cloud.bigquery.dbapi import connect
-        from google.cloud.bigquery.dbapi import Connection
+        from google.cloud.bigquery.dbapi import Connection, connect
 
         mock_client = self._mock_client()
         mock_bqstorage_client = self._mock_bqstorage_client()
@@ -103,8 +102,7 @@ class TestConnection(unittest.TestCase):
 
     def test_connect_w_both_clients(self):
         pytest.importorskip("google.cloud.bigquery_storage")
-        from google.cloud.bigquery.dbapi import connect
-        from google.cloud.bigquery.dbapi import Connection
+        from google.cloud.bigquery.dbapi import Connection, connect
 
         mock_client = self._mock_client()
         mock_bqstorage_client = self._mock_bqstorage_client()
@@ -124,8 +122,7 @@ class TestConnection(unittest.TestCase):
 
     def test_connect_prefer_bqstorage_client_false(self):
         pytest.importorskip("google.cloud.bigquery_storage")
-        from google.cloud.bigquery.dbapi import connect
-        from google.cloud.bigquery.dbapi import Connection
+        from google.cloud.bigquery.dbapi import Connection, connect
 
         mock_client = self._mock_client()
         mock_bqstorage_client = self._mock_bqstorage_client()
@@ -155,11 +152,16 @@ class TestConnection(unittest.TestCase):
             ):
                 getattr(connection, method)()
 
-    def test_close_closes_all_created_bigquery_clients(self):
+    def _verify_close_closes_all_created_bigquery_clients(
+        self, simulate_no_grpc_channel=False
+    ):
         pytest.importorskip("google.cloud.bigquery_storage")
         client = self._mock_client()
         bqstorage_client = self._mock_bqstorage_client()
 
+        if simulate_no_grpc_channel:
+            bqstorage_client.transport._grpc_channel = None
+
         client_patcher = mock.patch(
             "google.cloud.bigquery.dbapi.connection.bigquery.Client",
             return_value=client,
@@ -176,7 +178,20 @@ class TestConnection(unittest.TestCase):
         connection.close()
 
         self.assertTrue(client.close.called)
-        self.assertTrue(bqstorage_client._transport.close.called)
+        self.assertTrue(bqstorage_client.transport.close.called)
+
+        if not simulate_no_grpc_channel:
+            self.assertTrue(bqstorage_client.transport._grpc_channel.close.called)
+
+    def test_close_closes_all_created_bigquery_clients(self):
+        self._verify_close_closes_all_created_bigquery_clients(
+            simulate_no_grpc_channel=False
+        )
+
+    def test_close_closes_all_created_bigquery_clients_no_grpc_channel(self):
+        self._verify_close_closes_all_created_bigquery_clients(
+            simulate_no_grpc_channel=True
+        )
 
     def test_close_does_not_close_bigquery_clients_passed_to_it(self):
         pytest.importorskip("google.cloud.bigquery_storage")
@@ -187,7 +202,8 @@ class TestConnection(unittest.TestCase):
         connection.close()
 
         self.assertFalse(client.close.called)
-        self.assertFalse(bqstorage_client._transport.close.called)
+        self.assertFalse(bqstorage_client.transport.close.called)
+        self.assertFalse(bqstorage_client.transport._grpc_channel.close.called)
 
     def test_close_closes_all_created_cursors(self):
         connection = self._make_one(client=self._mock_client())