Skip to content

Commit

Permalink
FIX: Handle the case where fiona isn't installed anymore (with `geopa…
Browse files Browse the repository at this point in the history
…ndas 1.0`)
  • Loading branch information
remi-braun committed Jul 26, 2024
1 parent eda09a1 commit ef7e00b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- FIX: Fix error in looking for bands in Sentinel-2 L1C archived products ([#168](https://github.com/sertit/eoreader/issues/168))
- FIX: Handle wrongly recognized Planet products because of the recursive nested mtd in the Reader ([#169](https://github.com/sertit/eoreader/issues/169))
- FIX: Force the loading of `DimapV1` bands in `float32`
- FIX: Handle the case where fiona isn't installed anymore (with `geopandas 1.0`)
- OPTIM: Search correctly nested metadata in the Reader (without accidentally using a recursive glob)
- CI: Fix S3 endpoint management with `sertit>=1.37`

Expand Down
3 changes: 1 addition & 2 deletions eoreader/products/optical/s2_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import rasterio
import xarray as xr
from affine import Affine
from fiona.errors import DriverError
from lxml import etree
from pystac import Item
from rasterio import errors, features, transform
Expand Down Expand Up @@ -899,7 +898,7 @@ def _open_mask_lt_4_0(
# Read vector
try:
mask = vectors.read(mask_path, crs=self.crs())
except DriverError:
except vectors.DataSourceError:
LOGGER.warning(f"Corrupted mask: {mask_path}. Returning an empty one.")
mask = gpd.GeoDataFrame(geometry=[], crs=self.crs())

Expand Down
2 changes: 1 addition & 1 deletion eoreader/products/sar/csg_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def _post_init(self, **kwargs) -> None:
"""
# Calibration fails with CSG data
LOGGER.debug(
"SNAP Error: Calibration currently fails for CSG data. Removing this step."
"SNAP Error: Calibration is useless for CSG data. Removing this step."
)
self._calibrate = False

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ geopandas>=0.11.0
spyndex>=0.3.0

# SERTIT libs
sertit[full]>=1.33.0
sertit[full]>=1.38.0

# Optimizations
dask[complete]>=2021.10.0
Expand Down

0 comments on commit ef7e00b

Please sign in to comment.