googleapis · gcf-merge-on-green · Mar 27, 2024 · Mar 20, 2024 · Mar 20, 2024 · Mar 21, 2024
@@ -67,7 +67,7 @@ def get_progress_bar(progress_bar_type, description, total, unit):
  )
  elif progress_bar_type == "tqdm_gui":
  return tqdm.tqdm_gui(desc=description, total=total, unit=unit)
- except (KeyError, TypeError):
+ except (KeyError, TypeError): # pragma: NO COVER
  # Protect ourselves from any tqdm errors. In case of
  # unexpected tqdm behavior, just fall back to showing
  # no progress bar.

@@ -593,7 +593,7 @@ def _ensure_bqstorage_client(
  )
  return None
 
- if bqstorage_client is None:
+ if bqstorage_client is None: # pragma: NO COVER
  bqstorage_client = bigquery_storage.BigQueryReadClient(
  credentials=self._credentials,
  client_options=client_options,

@@ -45,8 +45,9 @@
 ]
 pyarrow_dependency = "pyarrow >= 3.0.0"
 extras = {
- # Keep the no-op bqstorage extra for backward compatibility.
- # See: https://github.com/googleapis/python-bigquery/issues/757
+ # bqstorage had a period where it was a required dependency, and has been
+ # 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.6.0, <3.0.0dev",
  # Due to an issue in pip's dependency resolver, the `grpc` extra is not

@@ -55,16 +55,6 @@
 
 from . import helpers
 
-try:
- from google.cloud import bigquery_storage
-except ImportError: # pragma: NO COVER
- bigquery_storage = None
-
-try:
- import pyarrow
- import pyarrow.types
-except ImportError: # pragma: NO COVER
- pyarrow = None
 
 JOB_TIMEOUT = 120 # 2 minutes
 DATA_PATH = pathlib.Path(__file__).parent.parent / "data"
@@ -1800,11 +1790,11 @@ def test_dbapi_fetchall_from_script(self):
  row_tuples = [r.values() for r in rows]
  self.assertEqual(row_tuples, [(5, "foo"), (6, "bar"), (7, "baz")])
 
- @unittest.skipIf(
- bigquery_storage is None, "Requires `google-cloud-bigquery-storage`"
- )
- @unittest.skipIf(pyarrow is None, "Requires `pyarrow`")
  def test_dbapi_fetch_w_bqstorage_client_large_result_set(self):
+ pytest.importorskip("google.cloud.bigquery_storage")
+ pytest.importorskip("pyarrow")
+ from google.cloud import bigquery_storage
+
  bqstorage_client = bigquery_storage.BigQueryReadClient(
  credentials=Config.CLIENT._credentials
  )
@@ -1862,10 +1852,8 @@ def test_dbapi_dry_run_query(self):
 
  self.assertEqual(list(rows), [])
 
- @unittest.skipIf(
- bigquery_storage is None, "Requires `google-cloud-bigquery-storage`"
- )
  def test_dbapi_connection_does_not_leak_sockets(self):
+ pytest.importorskip("google.cloud.bigquery_storage")
  current_process = psutil.Process()
  conn_count_start = len(current_process.connections())
 
@@ -2410,11 +2398,11 @@ def test_create_table_rows_fetch_nested_schema(self):
  self.assertEqual(found[7], e_favtime)
  self.assertEqual(found[8], decimal.Decimal(expected["FavoriteNumber"]))
 
- @unittest.skipIf(pyarrow is None, "Requires `pyarrow`")
- @unittest.skipIf(
- bigquery_storage is None, "Requires `google-cloud-bigquery-storage`"
- )
  def test_nested_table_to_arrow(self):
+ pytest.importorskip("google.cloud.bigquery_storage")
+ pyarrow = pytest.importorskip("pyarrow")
+ pyarrow.types = pytest.importorskip("pyarrow.types")
+ from google.cloud import bigquery_storage
  from google.cloud.bigquery.job import SourceFormat
  from google.cloud.bigquery.job import WriteDisposition
 

diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -39,6 +39,11 @@ def LOCATION():
  yield "us-central"
 
 
+@pytest.fixture
+def PYARROW_MINIMUM_VERSION(): # pragma: NO COVER
+ return "3.0.0"
+
+
 def noop_add_server_timeout_header(headers, kwargs):
  if headers:
  kwargs["headers"] = headers