DEP: Update to geopandas 1 (#176)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,8 +34,8 @@ http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports
  - geocube version (`geocube --version`)
  - rasterio version (`rio --version`)
  - rasterio GDAL version (`rio --gdal-version`)
- - fiona version (`fio --version`)
- - fiona GDAL version (`fio --gdal-version`)
+ - pyogrio version (`python -c "import pyogrio; print(pyogrio.__version__)"`)
+ - pyogrio GDAL version (`python -c "import pyogrio; print(pyogrio.__gdal_version__)"`)
  - Python version (`python -c "import sys; print(sys.version.replace('\n', ' '))"`)
  - Operation System Information (`python -c "import platform; print(platform.platform())"`)
 
@@ -50,7 +50,7 @@ Environment (<code>conda list</code>):
 <details>
 
 ```
-$ conda list | grep -E "rasterio|xarray|gdal|fiona|scipy"
+$ conda list | grep -E "rasterio|xarray|gdal|pyogrio|scipy"
 
 ```
 </details>

.github/ISSUE_TEMPLATE/installation_issues.md

@@ -8,13 +8,13 @@ labels: installation-issues
 
 #### Installation method/steps
  - Installation method (conda, pip, from source, etc...)
- - Please provide all commands/steps you used to install geocube and GDAL/rasterio/fiona.
+ - Please provide all commands/steps you used to install geocube and GDAL/rasterio/pyogrio.
 
 #### Environment Information
  - rioxarray version you are attempting to install
  - rasterio version (`rio --version`)
  - rasterio GDAL version (`rio --gdal-version`)
- - fiona version (`fio --version`)
- - fiona GDAL version (`fio --gdal-version`)
+ - pyogrio version (`fio --version`)
+ - pyogrio GDAL version (`fio --gdal-version`)
  - Python version (`python -c "import sys; print(sys.version.replace('\n', ' '))"`)
  - Operation System Information (`python -c "import platform; print(platform.platform())"`)

.github/workflows/tests.yaml

@@ -40,7 +40,7 @@ jobs:
           environment-name: test
           create-args: >-
             python=${{ matrix.python-version }}
-            geopandas<1
+            geopandas
             numpy<2
             netcdf4
             odc-geo

docs/getting_started.rst

@@ -10,7 +10,7 @@ Getting Started
 and is powered by `GDAL <https://github.com/osgeo/gdal>`__ using:
 
 - `rasterio <https://github.com/mapbox/rasterio>`__
-- `fiona <https://github.com/toblerity/fiona>`__
+- `pyogrio <https://github.com/geopandas/pyogrio>`__
 - `odc-geo <https://github.com/opendatacube/odc-geo>`__
 
 

geocube/_show_versions.py

@@ -34,12 +34,12 @@ def _get_gdal_info():
     proj_info: dict
         system GDAL information
     """
-    import fiona
+    import pyogrio
     import rasterio
 
     blob = [
-        ("fiona", importlib.metadata.version("fiona")),
-        ("GDAL[fiona]", fiona.__gdal_version__),
+        ("pyogrio", importlib.metadata.version("pyogrio")),
+        ("GDAL[pyogrio]", pyogrio.__gdal_version__),
         ("rasterio", importlib.metadata.version("rasterio")),
         ("GDAL[rasterio]", rasterio.__gdal_version__),
     ]

geocube/geo_utils/geobox.py

@@ -6,7 +6,6 @@
 from collections.abc import Iterable
 from typing import Any, Optional, Union
 
-import fiona.errors
 import geopandas
 import rioxarray  # noqa: F401 pylint: disable=unused-import
 import shapely.geometry.base
@@ -69,12 +68,7 @@ def load_vector_data(
     logger = get_logger()
 
     if isinstance(vector_data, (str, os.PathLike)):
-        try:
-            vector_data = geopandas.read_file(vector_data, include_fields=measurements)
-        except fiona.errors.DriverError as error:
-            if "ignore_fields" not in str(error):
-                raise
-            vector_data = geopandas.read_file(vector_data)
+        vector_data = geopandas.read_file(vector_data, columns=measurements)
 
     elif not isinstance(vector_data, geopandas.GeoDataFrame):
         vector_data = geopandas.GeoDataFrame(vector_data)
@@ -95,7 +89,7 @@ def load_vector_data(
 
     # make sure projection is set
     if not vector_data.crs:
-        vector_data.crs = "EPSG:4326"
+        vector_data.set_crs("EPSG:4326")
         logger.warning(
             "Projection not defined in `vector_data`."
             " Setting to geographic (EPSG:4326)."

geocube/xarray_extensions/vectorxarray.py

@@ -68,9 +68,9 @@ def to_geodataframe(self):
         extra_coords = list(set(list(out_obj.coords)) - {"geometry"})
         if extra_coords:
             out_obj = out_obj.copy().reset_coords(extra_coords)
-        geodf = geopandas.GeoDataFrame(out_obj.to_dataframe().reset_index())
-        geodf.crs = self._obj.rio.crs
-        return geodf
+        return geopandas.GeoDataFrame(
+            out_obj.to_dataframe().reset_index(), crs=self._obj.rio.crs
+        )
 
     def to_netcdf(self, *args, **kwargs):
         """

mypy.ini

@@ -6,7 +6,7 @@ plugins = numpy.typing.mypy_plugin
 [mypy-appdirs]
 ignore_missing_imports = True
 
-[mypy-fiona.*]
+[mypy-pyogrio.*]
 ignore_missing_imports = True
 
 [mypy-geopandas]

pyproject.toml

@@ -35,7 +35,7 @@ requires-python = ">=3.10"
 dependencies = [
     "appdirs",
     "click>=6.0",
-    "geopandas>=0.7,<1",
+    "geopandas>=1",
     "odc_geo",
     "rasterio>=1.3",
     "rioxarray>=0.4",

test/unit/test_show_versions.py

@@ -6,8 +6,8 @@ def test_get_gdal_info():
     gdal_info = _get_gdal_info()
     assert "rasterio" in gdal_info
     assert "GDAL[rasterio]" in gdal_info
-    assert "fiona" in gdal_info
-    assert "GDAL[fiona]" in gdal_info
+    assert "pyogrio" in gdal_info
+    assert "GDAL[pyogrio]" in gdal_info
 
 
 def test_get_sys_info():