[pre-commit.ci] pre-commit autoupdate (#1954)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.13.3 → v0.14.10](astral-sh/ruff-pre-commit@v0.13.3...v0.14.10)
- [github.com/fsfe/reuse-tool: v6.0.0 → v6.2.0](fsfe/reuse-tool@v6.0.0...v6.2.0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: types

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <lkstrp@pm.me>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.13.3
+  rev: v0.14.10
   hooks:
     # Run the linter.
   - id: ruff
@@ -58,6 +58,6 @@ repos:
 
   # Check for FSFE REUSE compliance (licensing)
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v6.0.0
+  rev: v6.2.0
   hooks:
   - id: reuse-lint-file

scripts/_helpers.py

@@ -8,10 +8,10 @@
 import os
 import re
 import time
+from collections.abc import Callable
 from functools import partial, wraps
 from pathlib import Path
 from tempfile import NamedTemporaryFile
-from typing import Callable, Union
 
 import atlite
 import fiona
@@ -990,7 +990,7 @@ def rename_techs(label: str) -> str:
 
 
 def load_cutout(
-    cutout_files: Union[str, list[str]], time: Union[None, pd.DatetimeIndex] = None
+    cutout_files: str | list[str], time: None | pd.DatetimeIndex = None
 ) -> atlite.Cutout:
     """
     Load and optionally combine multiple cutout files.

scripts/build_co2_sequestration_potentials.py

@@ -7,7 +7,7 @@
 database_en>`_.
 """
 
-from typing import Any, Union
+from typing import Any
 
 import geopandas as gpd
 import numpy as np
@@ -19,8 +19,8 @@
 
 
 def convert_to_2d(
-    geom: Union[sg.base.BaseGeometry, Any],
-) -> Union[sg.base.BaseGeometry, Any]:
+    geom: sg.base.BaseGeometry | Any,
+) -> sg.base.BaseGeometry | Any:
     """
     Remove the third dimension (z-coordinate) from a shapely geometry object.
 

scripts/build_cop_profiles/base_cop_approximator.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 from abc import ABC, abstractmethod
-from typing import Union
 
 import numpy as np
 import xarray as xr
@@ -35,8 +34,8 @@ class BaseCopApproximator(ABC):
 
     def __init__(
         self,
-        sink_outlet_temperature_celsius: Union[xr.DataArray, np.array],
-        source_inlet_temperature_celsius: Union[xr.DataArray, np.array],
+        sink_outlet_temperature_celsius: xr.DataArray | np.ndarray,
+        source_inlet_temperature_celsius: xr.DataArray | np.ndarray,
     ):
         """
         Initialize CopApproximator.
@@ -51,7 +50,7 @@ def __init__(
         pass
 
     @property
-    def cop(self) -> Union[xr.DataArray, np.array]:
+    def cop(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the coefficient of performance (COP) for the system.
 
@@ -70,7 +69,7 @@ def cop(self) -> Union[xr.DataArray, np.array]:
         return ret_val
 
     @abstractmethod
-    def _approximate_cop(self) -> Union[xr.DataArray, np.array]:
+    def _approximate_cop(self) -> xr.DataArray | np.ndarray:
         """
         Approximate heat pump coefficient of performance (COP).
 
@@ -83,8 +82,8 @@ def _approximate_cop(self) -> Union[xr.DataArray, np.array]:
 
     @staticmethod
     def celsius_to_kelvin(
-        t_celsius: Union[float, xr.DataArray, np.array],
-    ) -> Union[float, xr.DataArray, np.array]:
+        t_celsius: float | xr.DataArray | np.ndarray,
+    ) -> float | xr.DataArray | np.ndarray:
         """
         Convert temperature from Celsius to Kelvin.
 
@@ -106,9 +105,9 @@ def celsius_to_kelvin(
 
     @staticmethod
     def logarithmic_mean(
-        t_hot: Union[float, xr.DataArray, np.ndarray],
-        t_cold: Union[float, xr.DataArray, np.ndarray],
-    ) -> Union[float, xr.DataArray, np.ndarray]:
+        t_hot: float | xr.DataArray | np.ndarray,
+        t_cold: float | xr.DataArray | np.ndarray,
+    ) -> float | xr.DataArray | np.ndarray:
         """
         Calculate the logarithmic mean temperature difference.
 

scripts/build_cop_profiles/central_heating_cop_approximator.py

@@ -3,8 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 
-from typing import Union
-
 import numpy as np
 import xarray as xr
 
@@ -110,10 +108,10 @@ class CentralHeatingCopApproximator(BaseCopApproximator):
 
     def __init__(
         self,
-        sink_outlet_temperature_celsius: Union[xr.DataArray, np.array],
-        source_inlet_temperature_celsius: Union[xr.DataArray, np.array],
-        sink_inlet_temperature_celsius: Union[xr.DataArray, np.array],
-        source_outlet_temperature_celsius: Union[xr.DataArray, np.array],
+        sink_outlet_temperature_celsius: xr.DataArray | np.ndarray,
+        source_inlet_temperature_celsius: xr.DataArray | np.ndarray,
+        sink_inlet_temperature_celsius: xr.DataArray | np.ndarray,
+        source_outlet_temperature_celsius: xr.DataArray | np.ndarray,
         refrigerant: str,
         delta_t_pinch_point: float,
         isentropic_compressor_efficiency: float,
@@ -163,7 +161,7 @@ def __init__(
         self.delta_t_pinch = delta_t_pinch_point
         self.min_delta_t_lift = min_delta_t_lift
 
-    def _approximate_cop(self) -> Union[xr.DataArray, np.array]:
+    def _approximate_cop(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the coefficient of performance (COP) for the system.
 
@@ -203,7 +201,7 @@ def _approximate_cop(self) -> Union[xr.DataArray, np.array]:
         )
 
     @property
-    def t_sink_mean_kelvin(self) -> Union[xr.DataArray, np.array]:
+    def t_sink_mean_kelvin(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the logarithmic mean temperature difference between the cold
         and hot sinks.
@@ -218,7 +216,7 @@ def t_sink_mean_kelvin(self) -> Union[xr.DataArray, np.array]:
         )
 
     @property
-    def t_source_mean_kelvin(self) -> Union[xr.DataArray, np.array]:
+    def t_source_mean_kelvin(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the logarithmic mean temperature of the heat source.
 
@@ -232,7 +230,7 @@ def t_source_mean_kelvin(self) -> Union[xr.DataArray, np.array]:
         )
 
     @property
-    def delta_t_mean_lift(self) -> Union[xr.DataArray, np.array]:
+    def delta_t_mean_lift(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the temperature lift as the difference between the
         logarithmic sink and source temperatures.
@@ -245,15 +243,15 @@ def delta_t_mean_lift(self) -> Union[xr.DataArray, np.array]:
         return self.t_sink_mean_kelvin - self.t_source_mean_kelvin
 
     @property
-    def delta_t_lift(self) -> Union[xr.DataArray, np.array]:
+    def delta_t_lift(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the temperature lift as the difference between the
         sink and source temperatures.
         """
         return self.t_sink_out_kelvin - self.t_source_in_kelvin
 
     @property
-    def ideal_lorenz_cop(self) -> Union[xr.DataArray, np.array]:
+    def ideal_lorenz_cop(self) -> xr.DataArray | np.ndarray:
         """
         Ideal Lorenz coefficient of performance (COP).
 
@@ -268,7 +266,7 @@ def ideal_lorenz_cop(self) -> Union[xr.DataArray, np.array]:
         return self.t_sink_mean_kelvin / self.delta_t_mean_lift
 
     @property
-    def delta_t_refrigerant_source(self) -> Union[xr.DataArray, np.array]:
+    def delta_t_refrigerant_source(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the temperature difference between the refrigerant source
         inlet and outlet.
@@ -283,7 +281,7 @@ def delta_t_refrigerant_source(self) -> Union[xr.DataArray, np.array]:
         )
 
     @property
-    def delta_t_refrigerant_sink(self) -> Union[xr.DataArray, np.array]:
+    def delta_t_refrigerant_sink(self) -> xr.DataArray | np.ndarray:
         """
         Temperature difference between the refrigerant and the sink based on
         approximation.
@@ -296,7 +294,7 @@ def delta_t_refrigerant_sink(self) -> Union[xr.DataArray, np.array]:
         return self._approximate_delta_t_refrigerant_sink(self.refrigerant)
 
     @property
-    def ratio_evaporation_compression_work(self) -> Union[xr.DataArray, np.array]:
+    def ratio_evaporation_compression_work(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the ratio of evaporation to compression work based on
         approximation.
@@ -309,7 +307,7 @@ def ratio_evaporation_compression_work(self) -> Union[xr.DataArray, np.array]:
         return self._ratio_evaporation_compression_work_approximation(self.refrigerant)
 
     @property
-    def delta_t_sink(self) -> Union[xr.DataArray, np.array]:
+    def delta_t_sink(self) -> xr.DataArray | np.ndarray:
         """
         Calculate the temperature difference at the sink.
 
@@ -321,8 +319,8 @@ def delta_t_sink(self) -> Union[xr.DataArray, np.array]:
         return self.t_sink_out_kelvin - self.t_sink_in_kelvin
 
     def _approximate_delta_t_refrigerant_source(
-        self, delta_t_source: Union[xr.DataArray, np.array]
-    ) -> Union[xr.DataArray, np.array]:
+        self, delta_t_source: xr.DataArray | np.ndarray
+    ) -> xr.DataArray | np.ndarray:
         """
         Approximates the temperature difference between the refrigerant and the
         source.
@@ -345,7 +343,7 @@ def _approximate_delta_t_refrigerant_sink(
         a: float = {"ammonia": 0.2, "isobutane": -0.0011},
         b: float = {"ammonia": 0.2, "isobutane": 0.3},
         c: float = {"ammonia": 0.016, "isobutane": 2.4},
-    ) -> Union[xr.DataArray, np.array]:
+    ) -> xr.DataArray | np.ndarray:
         """
         Approximates the temperature difference between the refrigerant and
         heat sink.
@@ -394,7 +392,7 @@ def _ratio_evaporation_compression_work_approximation(
         a: float = {"ammonia": 0.0014, "isobutane": 0.0035},
         b: float = {"ammonia": -0.0015, "isobutane": -0.0033},
         c: float = {"ammonia": 0.039, "isobutane": 0.053},
-    ) -> Union[xr.DataArray, np.array]:
+    ) -> xr.DataArray | np.ndarray:
         """
         Calculate the ratio of evaporation to compression work approximation.
 

scripts/build_cop_profiles/decentral_heating_cop_approximator.py

@@ -3,8 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 
-from typing import Union
-
 import numpy as np
 import xarray as xr
 
@@ -45,8 +43,8 @@ class DecentralHeatingCopApproximator(BaseCopApproximator):
 
     def __init__(
         self,
-        sink_outlet_temperature_celsius: Union[xr.DataArray, np.array],
-        source_inlet_temperature_celsius: Union[xr.DataArray, np.array],
+        sink_outlet_temperature_celsius: xr.DataArray | np.ndarray,
+        source_inlet_temperature_celsius: xr.DataArray | np.ndarray,
         source_type: str,
     ):
         """
@@ -70,7 +68,7 @@ def __init__(
         else:
             self.source_type = source_type
 
-    def _approximate_cop(self) -> Union[xr.DataArray, np.array]:
+    def _approximate_cop(self) -> xr.DataArray | np.ndarray:
         """
         Compute the COP values using quadratic regression for air-/ground-
         source heat pumps.
@@ -85,7 +83,7 @@ def _approximate_cop(self) -> Union[xr.DataArray, np.array]:
         elif self.source_type == "ground":
             return self._approximate_cop_ground_source()
 
-    def _approximate_cop_air_source(self) -> Union[xr.DataArray, np.array]:
+    def _approximate_cop_air_source(self) -> xr.DataArray | np.ndarray:
         """
         Evaluate quadratic regression for an air-sourced heat pump.
 
@@ -98,7 +96,7 @@ def _approximate_cop_air_source(self) -> Union[xr.DataArray, np.array]:
         """
         return 6.81 - 0.121 * self.delta_t + 0.000630 * self.delta_t**2
 
-    def _approximate_cop_ground_source(self) -> Union[xr.DataArray, np.array]:
+    def _approximate_cop_ground_source(self) -> xr.DataArray | np.ndarray:
         """
         Evaluate quadratic regression for a ground-sourced heat pump.
 

scripts/build_surface_water_heat_potentials/approximators/river_water_heat_approximator.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 import warnings
-from typing import Union
 
 import geopandas as gpd
 import numpy as np
@@ -29,7 +28,7 @@ def __init__(
         self,
         volume_flow: xr.DataArray,
         ambient_temperature: xr.DataArray,
-        region: Union[shapely.geometry.polygon.Polygon, gpd.GeoSeries],
+        region: shapely.geometry.polygon.Polygon | gpd.GeoSeries,
         max_relative_volume_flow: float = 1.0,
         delta_t_max: float = 1,
         min_outlet_temperature: float = 1,

scripts/build_surface_water_heat_potentials/approximators/sea_water_heat_approximator.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 import logging
-from typing import Union
 
 import geopandas as gpd
 import shapely
@@ -30,7 +29,7 @@ class SeaWaterHeatApproximator(SurfaceWaterHeatApproximator):
     def __init__(
         self,
         water_temperature: xr.DataArray,
-        region: Union[shapely.geometry.polygon.Polygon, gpd.GeoSeries],
+        region: shapely.geometry.polygon.Polygon | gpd.GeoSeries,
         min_inlet_temperature: float = 1,
     ) -> None:
         # buffer the region geometry by half the data resolution

scripts/build_surface_water_heat_potentials/approximators/surface_water_heat_approximator.py

@@ -4,7 +4,6 @@
 import logging
 from abc import ABC
 from functools import cached_property
-from typing import Union
 
 import geopandas as gpd
 import numpy as np
@@ -33,7 +32,7 @@ def __init__(
         self,
         volume_flow: xr.DataArray,
         water_temperature: xr.DataArray,
-        region: Union[shapely.geometry.polygon.Polygon, gpd.GeoSeries],
+        region: shapely.geometry.polygon.Polygon | gpd.GeoSeries,
         max_relative_volume_flow: float = 1.0,
         delta_t_max: float = 4,
         min_outlet_temperature: float = 1,

scripts/plot_heat_source_map.py

@@ -46,7 +46,6 @@
 """
 
 import logging
-from typing import Optional
 
 import folium
 import geopandas as gpd
@@ -67,7 +66,7 @@ def plot_heat_source_map(
     longitude_name: str = "longitude",
     latitude_name: str = "latitude",
     onshore_region_name: str = "name",
-    title: Optional[str] = None,
+    title: str | None = None,
     cmap: str = "viridis",
     aggregate_type: str = "mean",  # 'mean' for temperature, 'sum' for energy
 ) -> folium.Map: