diff --git a/google/cloud/bigquery/table.py b/google/cloud/bigquery/table.py index 2065c5fd2..4fd77dd21 100644 --- a/google/cloud/bigquery/table.py +++ b/google/cloud/bigquery/table.py @@ -40,10 +40,11 @@ try: import shapely # type: ignore + from shapely import wkt # type: ignore except ImportError: shapely = None else: - _read_wkt = shapely.wkt.loads + _read_wkt = wkt.loads import google.api_core.exceptions from google.api_core.page_iterator import HTTPIterator diff --git a/samples/geography/requirements.txt b/samples/geography/requirements.txt index ef50fafb6..798de6bb5 100644 --- a/samples/geography/requirements.txt +++ b/samples/geography/requirements.txt @@ -10,7 +10,7 @@ db-dtypes==1.0.4 Fiona==1.8.22 geojson==2.5.0 geopandas===0.10.2; python_version == '3.7' -geopandas==0.11.1; python_version >= '3.8' +geopandas==0.12.1; python_version >= '3.8' google-api-core==2.10.2 google-auth==2.13.0 google-cloud-bigquery==3.3.5 diff --git a/tests/unit/test_table.py b/tests/unit/test_table.py index fca43f1ee..f542c7523 100644 --- a/tests/unit/test_table.py +++ b/tests/unit/test_table.py @@ -15,6 +15,7 @@ import datetime import logging import re +from sys import version_info import time import types import unittest @@ -1969,7 +1970,10 @@ def test_to_geodataframe(self): df = row_iterator.to_geodataframe(create_bqstorage_client=False) self.assertIsInstance(df, geopandas.GeoDataFrame) self.assertEqual(len(df), 0) # verify the number of rows - self.assertIsNone(df.crs) + if version_info.major == 3 and version_info.minor > 7: + assert not hasattr(df, "crs") # used with Python > 3.7 + else: + self.assertIsNone(df.crs) # used with Python == 3.7 class TestRowIterator(unittest.TestCase):