Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion google/cloud/bigquery/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/geography/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion tests/unit/test_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import datetime
import logging
import re
from sys import version_info
import time
import types
import unittest
Expand Down Expand Up @@ -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):
Expand Down