Drop support for Python 3.9, require >= 3.10 (#456)

Fix ruff for zip.

Signed-off-by: Violeta Crespo Cobas <vcrespo@arfima.com>

Author: violetacc

docs/user_guide/vulnerability/vulnerability_functions/multi_hazard_wri_power_generating_assets/onboard.ipynb

@@ -30,7 +30,7 @@
     "df = pandas.read_csv(\"raw.csv\")\n",
     "df[\"Asset Type\"] = [\n",
     "    (x if pandas.isna(y) else (x + \"/\" + y)).replace(\" \", \"\")\n",
-    "    for (x, y) in zip(df[\"Turbine Type\"], df[\"Cooling Technology\"])\n",
+    "    for (x, y) in zip(df[\"Turbine Type\"], df[\"Cooling Technology\"], strict=False)\n",
     "]\n",
     "df.drop(columns=[\"Turbine Type\", \"Cooling Technology\"], inplace=True)\n",
     "\n",

pdm.lock

@@ -5,29 +5,29 @@ name = "physrisk-lib"
 version = "1.0.12"
 description = "OS-Climate Physical Risk Library"
 authors = [
-    {name = "Joe Moorhouse",email = "5102656+joemoorhouse@users.noreply.github.com"},
+    { name = "Joe Moorhouse", email = "5102656+joemoorhouse@users.noreply.github.com" },
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
-license = {file = "LICENSE"}
+license = { file = "LICENSE" }
 keywords = ["Physical", "Climate", "Risk", "Finance"]
 
 classifiers = [
-  "Intended Audience :: Developers",
-  "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: Apache Software License",
-  "Operating System :: MacOS",
-  "Operating System :: Microsoft :: Windows",
-  "Operating System :: Unix",
-  "Programming Language :: Python",
-  "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.9",
-  "Topic :: Office/Business :: Financial",
-  "Topic :: Scientific/Engineering",
-  "Topic :: Software Development",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: Unix",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.10",
+    "Topic :: Office/Business :: Financial",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Software Development",
 ]
 
 dependencies = [
@@ -59,11 +59,7 @@ Documentation = "https://github.com/os-climate/physrisk/tree/main/docs"
 "Source Code" = "https://github.com/os-climate/physrisk"
 
 [build-system]
-requires = [
-    "setuptools>=42",
-    "wheel",
-    "pdm"
-]
+requires = ["setuptools>=42", "wheel", "pdm"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
@@ -80,16 +76,11 @@ physrisk = [
     "data/static/*.json",
     "data/static/example_portfolios/*.json",
     "data/static/hazard/*.json",
-    "data/static/vulnerability/*.json"
+    "data/static/vulnerability/*.json",
 ]
 
 [tool.pdm.dev-dependencies]
-test = [
-    "pdm[pytest]",
-    "pytest",
-    "pytest-cov",
-    "openpyxl>=3.1.5",
-]
+test = ["pdm[pytest]", "pytest", "pytest-cov", "openpyxl>=3.1.5"]
 doc = [
     "numpydoc",
     "nbsphinx",
@@ -108,12 +99,7 @@ doc = [
     "graphviz",
     "plotly>=5.24.1",
 ]
-dev = [
-    "mypy",
-    "pre-commit",
-    "ruff",
-    "tox"
-]
+dev = ["mypy", "pre-commit", "ruff", "tox"]
 
 [tool.pdm.scripts]
 pre_release = "scripts/dev-versioning.sh"
@@ -125,7 +111,7 @@ docs = { shell = "cd docs && make html", help = "Start the dev server for doc pr
 open_docs = { shell = "open ./docs/_build/html/index.html", help = "Start the dev server for doc preview" }
 lint = "pre-commit run --all-files"
 complete = { call = "tasks.complete:main", help = "Create autocomplete files for bash and fish" }
-all = {composite = ["pytest", "lint"]}
+all = { composite = ["pytest", "lint"] }
 
 [tool.pytest.ini_options]
 testpaths = "tests"
@@ -152,13 +138,13 @@ skip_empty = true
 ignore_errors = true
 show_missing = true
 exclude_lines = [
-  "pragma: no cover",
-  "def __repr__",
-  "if self.debug:",
-  "raise NotImplementedError",
-  "if __name__ == .__main__.:",
-  "pass",
-  "raise ImportError",
+    "pragma: no cover",
+    "def __repr__",
+    "if self.debug:",
+    "raise NotImplementedError",
+    "if __name__ == .__main__.:",
+    "pass",
+    "raise ImportError",
 ]
 
 [tool.coverage.html]
@@ -198,14 +184,17 @@ exclude = [
 [tool.ruff.lint]
 extend-fixable = [
     # Instead of trailing-whitespace
-    "W291", "W293"
-    ]
+    "W291",
+    "W293",
+]
 
 extend-select = [
     # Instead of pydocstyle
     "D",
     #Instead of flake8
-    "E", "F","B",
+    "E",
+    "F",
+    "B",
     # Instead of pep8-naming
     "N",
     # Instead of flake8-debugger or debug-statements
@@ -220,7 +209,11 @@ ignore = [
     "D213",
 
     # Ignore this rules so that precommit passes. Uncomment to start fixing them
-    "B006", "B008", "B904", "B012", "B024",
+    "B006",
+    "B008",
+    "B904",
+    "B012",
+    "B024",
     "D",
 ]
 

pyproject.toml

@@ -41,7 +41,7 @@ def dataset_read_bounded(dataset, longitudes, latitudes, window_half_width=0.01)
             points,
             [
                 [lon + offset[0], lat + offset[1]]
-                for (lon, lat) in zip(longitudes, latitudes)
+                for (lon, lat) in zip(longitudes, latitudes, strict=False)
             ],
         )
 
@@ -53,7 +53,7 @@ def dataset_read_bounded(dataset, longitudes, latitudes, window_half_width=0.01)
 
 
 def dataset_read_points(dataset, longitudes, latitudes, window_half_width=0.01):
-    points = [[lon, lat] for (lon, lat) in zip(longitudes, latitudes)]
+    points = [[lon, lat] for (lon, lat) in zip(longitudes, latitudes, strict=False)]
     samples = np.array(list(rasterio.sample.sample_gen(dataset, points)))
     return samples
 
@@ -62,7 +62,7 @@ def dataset_read_windows(dataset, longitudes, latitudes, window_half_width=0.01)
     # seem to need to do one window at a time: potentially slow
     hw = window_half_width
     samples = []
-    for lon, lat in zip(longitudes, latitudes):
+    for lon, lat in zip(longitudes, latitudes, strict=False):
         win = rasterio.windows.from_bounds(
             lon - hw, lat - hw, lon + hw, lat + hw, dataset.transform
         )  # left, bottom, right, top

src/physrisk/data/geotiff_reader.py

@@ -423,7 +423,7 @@ async def get_single_item(
                             )
                         )
                     )
-                    for longitude, latitude in zip(longitudes, latitudes)
+                    for longitude, latitude in zip(longitudes, latitudes, strict=False)
                 ],
                 self._interpolation,
             )  # type: ignore

src/physrisk/data/hazard_data_provider.py

@@ -107,7 +107,9 @@ def expand(resources: List[HazardResource]) -> List[HazardResource]:
                     scenario.periods.append(Period(year=year, map_id=id))
                 # if a period was specified explicitly, we check that hash is the same: a build-in check
                 if test_periods is not None:
-                    for period, test_period in zip(scenario.periods, test_periods):
+                    for period, test_period in zip(
+                        scenario.periods, test_periods, strict=False
+                    ):
                         if period.map_id != test_period.map_id:
                             raise Exception(
                                 f"validation error: hash {period.map_id} different to specified hash {test_period.map_id}"  # noqa: E501

src/physrisk/data/inventory.py

@@ -25,7 +25,7 @@ def get_countries_json():
     countries = [
         Country(continent=continent, country=country, country_iso_a3=code)
         for (continent, country, code) in zip(
-            world["continent"], world["name"], world["iso_a3"]
+            world["continent"], world["name"], world["iso_a3"], strict=False
         )
     ]
 

src/physrisk/data/static/world.py

@@ -264,7 +264,7 @@ def get_max_curves(
                 if multipoint.is_empty
                 else multipoint
             )
-            for shape, multipoint in zip(transformed_shapes, multipoints)
+            for shape, multipoint in zip(transformed_shapes, multipoints, strict=False)
         ]
         multipoints = [
             MultiPoint([(point.x, point.y)]) if isinstance(point, Point) else point
@@ -298,7 +298,7 @@ def get_max_curves(
                     else MultiPoint(transformed_shape.exterior.coords)
                 )
                 for transformed_shape, multipoint in zip(
-                    transformed_shapes, multipoints
+                    transformed_shapes, multipoints, strict=False
                 )
             ]
             image_coords = np.array(
@@ -326,7 +326,9 @@ def get_max_curves(
             [
                 np.nanmax(curves[index - number_of_points_per_shape : index, :], axis=0)
                 for number_of_points_per_shape, index in zip(
-                    numbers_of_points_per_shape, numbers_of_points_per_shape_cumulated
+                    numbers_of_points_per_shape,
+                    numbers_of_points_per_shape_cumulated,
+                    strict=False,
                 )
             ]
         )

src/physrisk/data/zarr_reader.py

@@ -138,7 +138,9 @@ def get_hazard_data(
             )
             group_country_codes = self.geocoder.get_countries(group_lats, group_lons)
 
-            for country_code, cache_key in zip(group_country_codes, groups.keys()):
+            for country_code, cache_key in zip(
+                group_country_codes, groups.keys(), strict=False
+            ):
                 request_groups[
                     RequestKey(
                         country_code=country_code, jba_scenario=cache_key.jba_scenario
@@ -230,7 +232,7 @@ async def flood_depth(
             "geometries": [
                 {"id": id, "wkt_geometry": f"POINT({lon} {lat})", "buffer": 10}
                 for id, lat, lon in zip(
-                    req_ids, api_request.latitudes, api_request.longitudes
+                    req_ids, api_request.latitudes, api_request.longitudes, strict=False
                 )
             ],
         }
@@ -262,7 +264,9 @@ def _identify_api_requests(
         # first checks cache
         cached_responses: Dict[JBACacheKey, Dict] = {
             cache_key: json.loads(item)
-            for cache_key, item in zip(cache_keys, self.cache_store.getitems(cache_ids))
+            for cache_key, item in zip(
+                cache_keys, self.cache_store.getitems(cache_ids), strict=False
+            )
             if item is not None
         }
         # we need to create requests for anything not in cache

src/physrisk/hazard_models/jba_hazard_model.py

@@ -84,7 +84,9 @@ def get_data_requests(
 
     def get_exposures(self, asset: Asset, data_responses: Sequence[HazardDataResponse]):
         result: Dict[type, Tuple[Category, float, str]] = {}
-        for (k, v), resp in zip(self.exposure_bins.items(), data_responses):
+        for (k, v), resp in zip(
+            self.exposure_bins.items(), data_responses, strict=False
+        ):
             if isinstance(resp, HazardParameterDataResponse):
                 param = resp.parameter
                 hazard_path = resp.path