test(duckdb-geospatial): fix incomplete skipping

ibis/backends/base/sql/alchemy/geospatial.py

@@ -3,6 +3,8 @@
 from importlib.util import find_spec as _find_spec
 
 geospatial_supported = (
-    _find_spec("geoalchemy2") is not None and _find_spec("geopandas") is not None
+    _find_spec("geoalchemy2") is not None
+    and _find_spec("geopandas") is not None
+    and _find_spec("shapely") is not None
 )
 __all__ = ["geospatial_supported"]

ibis/backends/duckdb/tests/conftest.py

@@ -97,33 +97,34 @@ def con(data_dir, tmp_path_factory, worker_id):
 
 
 @pytest.fixture(scope="session")
-def zones(con, data_dir):
-    zones = con.read_geo(data_dir / "geojson" / "zones.geojson")
-    return zones
+def gpd():
+    pytest.importorskip("shapely")
+    pytest.importorskip("geoalchemy2")
+    return pytest.importorskip("geopandas")
 
 
 @pytest.fixture(scope="session")
-def lines(con, data_dir):
-    lines = con.read_geo(data_dir / "geojson" / "lines.geojson")
-    return lines
+def zones(con, data_dir, gpd):
+    return con.read_geo(data_dir / "geojson" / "zones.geojson")
 
 
 @pytest.fixture(scope="session")
-def zones_gdf(data_dir):
-    gpd = pytest.importorskip("geopandas")
-    zones_gdf = gpd.read_file(data_dir / "geojson" / "zones.geojson")
-    return zones_gdf
+def lines(con, data_dir, gpd):
+    return con.read_geo(data_dir / "geojson" / "lines.geojson")
 
 
 @pytest.fixture(scope="session")
-def lines_gdf(data_dir):
-    gpd = pytest.importorskip("geopandas")
-    lines_gdf = gpd.read_file(data_dir / "geojson" / "lines.geojson")
-    return lines_gdf
+def zones_gdf(data_dir, gpd):
+    return gpd.read_file(data_dir / "geojson" / "zones.geojson")
 
 
 @pytest.fixture(scope="session")
-def geotable(con):
+def lines_gdf(data_dir, gpd):
+    return gpd.read_file(data_dir / "geojson" / "lines.geojson")
+
+
+@pytest.fixture(scope="session")
+def geotable(con, gpd):
     return con.table("geo")
 
 

ibis/backends/duckdb/tests/test_geospatial.py

@@ -13,6 +13,7 @@
 gpd = pytest.importorskip("geopandas")
 gtm = pytest.importorskip("geopandas.testing")
 shapely = pytest.importorskip("shapely")
+pytest.importorskip("geoalchemy2")
 
 
 def test_geospatial_point(zones, zones_gdf):

ibis/backends/duckdb/tests/test_register.py

@@ -91,25 +91,24 @@ def test_load_spatial_when_geo_column(tmpdir):
     assert "spatial" in con.sql(query).name.to_pandas().values
 
 
+@pytest.mark.usefixtures("gpd")
 def test_read_geo_to_pyarrow(con, data_dir):
-    pytest.importorskip("geopandas")
     shapely = pytest.importorskip("shapely")
 
     t = con.read_geo(data_dir / "geojson" / "zones.geojson")
     raw_geometry = t.head().to_pyarrow()["geom"].to_pandas()
     assert len(shapely.from_wkb(raw_geometry))
 
 
-def test_read_geo_to_geopandas(con, data_dir):
-    gpd = pytest.importorskip("geopandas")
+def test_read_geo_to_geopandas(con, data_dir, gpd):
     t = con.read_geo(data_dir / "geojson" / "zones.geojson")
     gdf = t.head().to_pandas()
     assert isinstance(gdf, gpd.GeoDataFrame)
 
 
 def test_read_geo_from_url(con, monkeypatch):
     loaded_exts = []
-    monkeypatch.setattr(con, "_load_extensions", lambda x, **kw: loaded_exts.extend(x))
+    monkeypatch.setattr(con, "_load_extensions", lambda x, **_: loaded_exts.extend(x))
 
     with pytest.raises((sa.exc.OperationalError, sa.exc.ProgrammingError)):
         # The read will fail, either because the URL is bogus (which it is) or
@@ -430,6 +429,7 @@ def test_csv_with_slash_n_null(con, tmp_path):
 )
 def test_register_filesystem_gcs(con):
     fsspec = pytest.importorskip("fsspec")
+    pytest.importorskip("gcsfs")
 
     gcs = fsspec.filesystem("gcs")