Remove checks for minimum BQ Storage version

Since this is now a required dependency, there should not be any more
pip quirks that used to allow installing BQ Storage as an extra, but
without always respecting its minimum version pin.

Author: plamut

google/cloud/bigquery/_helpers.py

@@ -28,8 +28,6 @@
 from google.cloud._helpers import _to_bytes
 import packaging.version
 
-from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
 
 _RFC3339_MICROS_NO_ZULU = "%Y-%m-%dT%H:%M:%S.%f"
 _TIMEONLY_WO_MICROS = "%H:%M:%S"
@@ -41,7 +39,6 @@
     re.VERBOSE,
 )
 
-_MIN_BQ_STORAGE_VERSION = packaging.version.Version("2.0.0")
 _BQ_STORAGE_OPTIONAL_READ_SESSION_VERSION = packaging.version.Version("2.6.0")
 
 
@@ -75,29 +72,6 @@ def is_read_session_optional(self) -> bool:
         """
         return self.installed_version >= _BQ_STORAGE_OPTIONAL_READ_SESSION_VERSION
 
-    def verify_version(self):
-        """Verify that a recent enough version of BigQuery Storage extra is
-        installed.
-
-        The function assumes that google-cloud-bigquery-storage extra is
-        installed, and should thus be used in places where this assumption
-        holds.
-
-        Because `pip` can install an outdated version of this extra despite the
-        constraints in `setup.py`, the calling code can use this helper to
-        verify the version compatibility at runtime.
-
-        Raises:
-            LegacyBigQueryStorageError:
-                If the google-cloud-bigquery-storage package is outdated.
-        """
-        if self.installed_version < _MIN_BQ_STORAGE_VERSION:
-            msg = (
-                "Dependency google-cloud-bigquery-storage is outdated, please upgrade "
-                f"it to version >= 2.0.0 (version found: {self.installed_version})."
-            )
-            raise LegacyBigQueryStorageError(msg)
-
 
 BQ_STORAGE_VERSIONS = BQStorageVersions()
 

google/cloud/bigquery/client.py

@@ -53,15 +53,13 @@
 from google.cloud.bigquery._helpers import _get_sub_prop
 from google.cloud.bigquery._helpers import _record_field_to_json
 from google.cloud.bigquery._helpers import _str_or_none
-from google.cloud.bigquery._helpers import BQ_STORAGE_VERSIONS
 from google.cloud.bigquery._helpers import _verify_job_config_type
 from google.cloud.bigquery._http import Connection
 from google.cloud.bigquery import _pandas_helpers
 from google.cloud.bigquery.dataset import Dataset
 from google.cloud.bigquery.dataset import DatasetListItem
 from google.cloud.bigquery.dataset import DatasetReference
 from google.cloud.bigquery.enums import AutoRowIDs
-from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
 from google.cloud.bigquery.opentelemetry_tracing import create_span
 from google.cloud.bigquery import job
 from google.cloud.bigquery.job import (
@@ -469,17 +467,10 @@ def _ensure_bqstorage_client(
     ) -> Optional["google.cloud.bigquery_storage.BigQueryReadClient"]:
         """Create a BigQuery Storage API client using this client's credentials.
 
-        If a client cannot be created due to an outdated dependency
-        `google-cloud-bigquery-storage`, raise a warning and return ``None``.
-
-        If the `bqstorage_client` argument is not ``None``, still perform the version
-        check and return the argument back to the caller if the check passes. If it
-        fails, raise a warning and return ``None``.
-
         Args:
             bqstorage_client:
-                An existing BigQuery Storage client instance to check for version
-                compatibility. If ``None``, a new instance is created and returned.
+                An existing BigQuery Storage client instance. If ``None``, a new
+                instance is created and returned.
             client_options:
                 Custom options used with a new BigQuery Storage client instance if one
                 is created.
@@ -492,12 +483,6 @@ def _ensure_bqstorage_client(
         """
         from google.cloud import bigquery_storage
 
-        try:
-            BQ_STORAGE_VERSIONS.verify_version()
-        except LegacyBigQueryStorageError as exc:
-            warnings.warn(str(exc))
-            return None
-
         if bqstorage_client is None:
             bqstorage_client = bigquery_storage.BigQueryReadClient(
                 credentials=self._credentials,

google/cloud/bigquery/exceptions.py

@@ -18,4 +18,8 @@ class BigQueryError(Exception):
 
 
 class LegacyBigQueryStorageError(BigQueryError):
-    """Raised when too old a version of BigQuery Storage extra is detected at runtime."""
+    """Raised when too old a version of BigQuery Storage extra is detected at runtime.
+
+    .. deprecated:: 2.2.0
+       Not used anymore and will be removed in the future.
+    """

google/cloud/bigquery/table.py

@@ -38,7 +38,6 @@
 import google.cloud._helpers
 from google.cloud.bigquery import _helpers
 from google.cloud.bigquery import _pandas_helpers
-from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
 from google.cloud.bigquery.schema import _build_schema_resource
 from google.cloud.bigquery.schema import _parse_schema_resource
 from google.cloud.bigquery.schema import _to_schema_fields
@@ -1552,12 +1551,6 @@ def _validate_bqstorage(self, bqstorage_client, create_bqstorage_client):
             )
             return False
 
-        try:
-            _helpers.BQ_STORAGE_VERSIONS.verify_version()
-        except LegacyBigQueryStorageError as exc:
-            warnings.warn(str(exc))
-            return False
-
         return True
 
     def _get_next_page_response(self):

tests/unit/test__helpers.py

@@ -26,37 +26,6 @@ def _object_under_test(self):
 
         return _helpers.BQStorageVersions()
 
-    def _call_fut(self):
-        from google.cloud.bigquery import _helpers
-
-        _helpers.BQ_STORAGE_VERSIONS._installed_version = None
-        return _helpers.BQ_STORAGE_VERSIONS.verify_version()
-
-    def test_raises_no_error_w_recent_bqstorage(self):
-        from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
-        with mock.patch("google.cloud.bigquery_storage.__version__", new="2.0.0"):
-            try:
-                self._call_fut()
-            except LegacyBigQueryStorageError:  # pragma: NO COVER
-                self.fail("Legacy error raised with a non-legacy dependency version.")
-
-    def test_raises_error_w_legacy_bqstorage(self):
-        from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
-        with mock.patch("google.cloud.bigquery_storage.__version__", new="1.9.9"):
-            with self.assertRaises(LegacyBigQueryStorageError):
-                self._call_fut()
-
-    def test_raises_error_w_unknown_bqstorage_version(self):
-        from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
-        with mock.patch("google.cloud.bigquery_storage", autospec=True) as fake_module:
-            del fake_module.__version__
-            error_pattern = r"version found: 0.0.0"
-            with self.assertRaisesRegex(LegacyBigQueryStorageError, error_pattern):
-                self._call_fut()
-
     def test_installed_version_returns_cached(self):
         versions = self._object_under_test()
         versions._installed_version = object()

tests/unit/test__pandas_helpers.py

@@ -42,7 +42,6 @@
 
 from google.cloud import bigquery_storage
 
-_helpers.BQ_STORAGE_VERSIONS.verify_version()
 
 PANDAS_MINIUM_VERSION = pkg_resources.parse_version("1.0.0")
 

tests/unit/test_client.py

@@ -618,25 +618,6 @@ def test_ensure_bqstorage_client_creating_new_instance(self):
             client_info=mock.sentinel.client_info,
         )
 
-    def test_ensure_bqstorage_client_obsolete_dependency(self):
-        from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
-        creds = _make_credentials()
-        client = self._make_one(project=self.PROJECT, credentials=creds)
-
-        patcher = mock.patch(
-            "google.cloud.bigquery.client.BQ_STORAGE_VERSIONS.verify_version",
-            side_effect=LegacyBigQueryStorageError("BQ Storage too old"),
-        )
-        with patcher, warnings.catch_warnings(record=True) as warned:
-            bqstorage_client = client._ensure_bqstorage_client()
-
-        self.assertIsNone(bqstorage_client)
-        matching_warnings = [
-            warning for warning in warned if "BQ Storage too old" in str(warning)
-        ]
-        assert matching_warnings, "Obsolete dependency warning not raised."
-
     def test_ensure_bqstorage_client_existing_client_check_passes(self):
         creds = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=creds)
@@ -648,26 +629,6 @@ def test_ensure_bqstorage_client_existing_client_check_passes(self):
 
         self.assertIs(bqstorage_client, mock_storage_client)
 
-    def test_ensure_bqstorage_client_existing_client_check_fails(self):
-        from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
-        creds = _make_credentials()
-        client = self._make_one(project=self.PROJECT, credentials=creds)
-        mock_storage_client = mock.sentinel.mock_storage_client
-
-        patcher = mock.patch(
-            "google.cloud.bigquery.client.BQ_STORAGE_VERSIONS.verify_version",
-            side_effect=LegacyBigQueryStorageError("BQ Storage too old"),
-        )
-        with patcher, warnings.catch_warnings(record=True) as warned:
-            bqstorage_client = client._ensure_bqstorage_client(mock_storage_client)
-
-        self.assertIsNone(bqstorage_client)
-        matching_warnings = [
-            warning for warning in warned if "BQ Storage too old" in str(warning)
-        ]
-        assert matching_warnings, "Obsolete dependency warning not raised."
-
     def test_create_routine_w_minimal_resource(self):
         from google.cloud.bigquery.routine import Routine
         from google.cloud.bigquery.routine import RoutineReference

tests/unit/test_magics.py

@@ -322,31 +322,6 @@ def test__make_bqstorage_client_true():
     assert isinstance(got, bigquery_storage.BigQueryReadClient)
 
 
-def test__make_bqstorage_client_true_obsolete_dependency():
-    from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
-    credentials_mock = mock.create_autospec(
-        google.auth.credentials.Credentials, instance=True
-    )
-    test_client = bigquery.Client(
-        project="test_project", credentials=credentials_mock, location="test_location"
-    )
-
-    patcher = mock.patch(
-        "google.cloud.bigquery.client.BQ_STORAGE_VERSIONS.verify_version",
-        side_effect=LegacyBigQueryStorageError("BQ Storage too old"),
-    )
-    with patcher, warnings.catch_warnings(record=True) as warned:
-        got = magics._make_bqstorage_client(test_client, True, {})
-
-    assert got is None
-
-    matching_warnings = [
-        warning for warning in warned if "BQ Storage too old" in str(warning)
-    ]
-    assert matching_warnings, "Obsolete dependency warning not raised."
-
-
 @pytest.mark.skipif(pandas is None, reason="Requires `pandas`")
 def test__make_bqstorage_client_true_missing_gapic(missing_grpcio_lib):
     credentials_mock = mock.create_autospec(

tests/unit/test_table.py

@@ -1844,27 +1844,6 @@ def test__validate_bqstorage_returns_false_when_completely_cached(self):
             )
         )
 
-    def test__validate_bqstorage_returns_false_w_warning_if_obsolete_version(self):
-        from google.cloud.bigquery.exceptions import LegacyBigQueryStorageError
-
-        iterator = self._make_one(first_page_response=None)  # not cached
-
-        patcher = mock.patch(
-            "google.cloud.bigquery.table._helpers.BQ_STORAGE_VERSIONS.verify_version",
-            side_effect=LegacyBigQueryStorageError("BQ Storage too old"),
-        )
-        with patcher, warnings.catch_warnings(record=True) as warned:
-            result = iterator._validate_bqstorage(
-                bqstorage_client=None, create_bqstorage_client=True
-            )
-
-        self.assertFalse(result)
-
-        matching_warnings = [
-            warning for warning in warned if "BQ Storage too old" in str(warning)
-        ]
-        assert matching_warnings, "Obsolete dependency warning not raised."
-
     def test_to_arrow(self):
         from google.cloud.bigquery.schema import SchemaField