fix some ruff and mypy errors

Author: jtherrmann

pyproject.toml

@@ -71,9 +71,9 @@ quote-style = "single"
 [tool.ruff.lint]
 extend-select = [
     "I",   # isort: https://docs.astral.sh/ruff/rules/#isort-i
+    "UP",  # pyupgrade: https://docs.astral.sh/ruff/rules/#pyupgrade-up
 
     # TODO: uncomment the following extensions and address their warnings:
-    #"UP",  # pyupgrade: https://docs.astral.sh/ruff/rules/#pyupgrade-up
     #"D",   # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d
     #"ANN", # annotations: https://docs.astral.sh/ruff/rules/#flake8-annotations-ann
     #"PTH", # use-pathlib-pth: https://docs.astral.sh/ruff/rules/#flake8-use-pathlib-pth

src/hyp3_srg/back_projection.py

@@ -127,8 +127,7 @@ def back_project(
         granule_orbit_pairs.append((granule_path, orbit_path))
 
     if bounds is None:
-        bounds = unary_union(bboxs).buffer(0.1).bounds
-        assert bounds is not None  # Return type annotation for unary_union is incorrect
+        bounds = list(unary_union(bboxs).buffer(0.1).bounds)
 
     dem_path = dem.download_dem_for_srg(bounds, work_dir)
     utils.create_param_file(dem_path, dem_path.with_suffix('.dem.rsc'), work_dir)

src/hyp3_srg/time_series.py

@@ -237,10 +237,10 @@ def create_time_series_product_name(
     latest_granule = start_dates[-1]
 
     def lat_string(lat):
-        return ('N' if lat >= 0 else 'S') + f'{("%.1f" % abs(lat)).zfill(4)}'.replace('.', '_')
+        return ('N' if lat >= 0 else 'S') + f'{("%.1f" % abs(lat)).zfill(4)}'.replace('.', '_')  # noqa: UP031
 
     def lon_string(lon):
-        return ('E' if lon >= 0 else 'W') + f'{("%.1f" % abs(lon)).zfill(5)}'.replace('.', '_')
+        return ('E' if lon >= 0 else 'W') + f'{("%.1f" % abs(lon)).zfill(5)}'.replace('.', '_')  # noqa: UP031
 
     return '_'.join(
         [

src/hyp3_srg/utils.py

@@ -9,7 +9,8 @@
 import asf_search
 from boto3 import client
 from s1_orbits import fetch_for_scene
-from shapely.geometry import Polygon, shape
+from shapely.geometry import shape
+from shapely.geometry.base import BaseGeometry
 
 
 S3 = client('s3')
@@ -115,7 +116,7 @@ def get_earthdata_credentials() -> tuple[str, str]:
     )
 
 
-def download_raw_granule(granule_name: str, output_dir: Path, unzip: bool = False) -> tuple[Path, Polygon]:
+def download_raw_granule(granule_name: str, output_dir: Path, unzip: bool = False) -> tuple[Path, BaseGeometry]:
     """Download a S1 granule using asf_search. Return its path
     and buffered extent.
 
@@ -155,26 +156,6 @@ def download_raw_granule(granule_name: str, output_dir: Path, unzip: bool = Fals
     return out_path, bbox
 
 
-def get_bbox(granule_name: str) -> tuple[Path, Polygon]:
-    """Get the buffered extent from asf_search.
-
-    Args:
-        granule_name: Name of the granule to download
-
-    Returns:
-        bbox: the buffered extent polygon
-    """
-    granule_name = granule_name.split('.')[0]
-
-    if not granule_name.endswith('-RAW'):
-        granule_name += '-RAW'
-
-    result = asf_search.granule_search([granule_name])[0]
-    bbox = shape(result.geojson()['geometry'])
-
-    return bbox
-
-
 def download_orbit(granule_name: str, output_dir: Path) -> Path:
     """Download a S1 orbit file. Prefer using the ESA API,
     but fallback to ASF if needed.

tests/test_dem.py

@@ -13,7 +13,7 @@ def test_download_dem_for_srg(monkeypatch):
         m.setattr(dem, 'ensure_egm_model_available', mock_ensure_egm_model_available)
         mock_call_stanford_module = mock.Mock()
         m.setattr(utils, 'call_stanford_module', mock_call_stanford_module)
-        dem.download_dem_for_srg(box(0, 1, 2, 3).bounds, Path.cwd())
+        dem.download_dem_for_srg(list(box(0, 1, 2, 3).bounds), Path.cwd())
         mock_ensure_egm_model_available.assert_called_once()
         mock_call_stanford_module.assert_called_once_with(
             'DEM/createDEMcop.py',