Use type union operator in 88 files

Author: khaeru

doc/conf.py

@@ -5,7 +5,7 @@
 
 import os
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     import sphinx.application
@@ -186,7 +186,7 @@ def setup(app: "sphinx.application.Sphinx") -> None:
 # -- Options for sphinx.ext.intersphinx ------------------------------------------------
 
 
-def local_inv(name: str, *parts: str) -> Optional[str]:
+def local_inv(name: str, *parts: str) -> str | None:
     """Construct the path to a local intersphinx inventory."""
     if 0 == len(parts):
         parts = ("doc", "_build", "html")

message_ix_models/model/build.py

@@ -1,6 +1,5 @@
 import logging
 from collections.abc import Callable, Mapping
-from typing import Optional, Union
 
 import ixmp
 import pandas as pd
@@ -30,8 +29,8 @@ def _add_unit(mp: ixmp.Platform, unit: str, comment: str) -> None:
 # FIXME Reduce complexity from 14 to ≤13
 def apply_spec(  # noqa: C901
     scenario: Scenario,
-    spec: Union[Spec, Mapping[str, ScenarioInfo]],
-    data: Optional[Callable] = None,
+    spec: Spec | Mapping[str, ScenarioInfo],
+    data: Callable | None = None,
     **options,
 ):
     """Apply `spec` to `scenario`.

message_ix_models/model/buildings/__init__.py

@@ -7,7 +7,7 @@
 import logging
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import ixmp
 import message_ix
@@ -92,7 +92,7 @@ class Config:
     with_materials: bool = True
 
     #: Path for STURM output.
-    _output_path: Optional[Path] = None
+    _output_path: Path | None = None
 
     #: Run the ACCESS model on every iteration.
     run_access: bool = False

message_ix_models/model/config.py

@@ -1,6 +1,6 @@
 import logging
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from message_ix_models.util.config import ConfigHelper
 from message_ix_models.util.node import identify_nodes
@@ -73,7 +73,7 @@ def check(self):
                 )
 
     def regions_from_scenario(
-        self, scenario: Optional["message_ix.Scenario"] = None
+        self, scenario: "message_ix.Scenario | None" = None
     ) -> None:
         """Update :attr:`regions` by inspection of an existing `scenario`.
 

message_ix_models/model/emissions.py

@@ -2,7 +2,7 @@
 import re
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 import genno
 import pandas as pd
@@ -73,7 +73,7 @@ def get(self) -> "AnyQuantity":
         return load_file(self.path, dims=dims)
 
 
-def get_emission_factors(units: Optional[str] = None) -> "AnyQuantity":
+def get_emission_factors(units: str | None = None) -> "AnyQuantity":
     """Return carbon emission factors.
 
     Values are from the file :file:`message_ix_models/data/ipcc/1996_v3_t1-2.csv`, in
@@ -152,7 +152,7 @@ def get_emission_factors(units: Optional[str] = None) -> "AnyQuantity":
 def add_tax_emission(
     scen: Scenario,
     price: float,
-    conversion_factor: Optional[float] = None,
+    conversion_factor: float | None = None,
     drate_parameter="drate",
 ) -> None:
     """Add a global CO₂ price to `scen`.
@@ -217,7 +217,7 @@ def add_tax_emission(
         scen.add_par(name, data)
 
 
-def split_species(unit_expr: str) -> tuple[str, Optional[str]]:
+def split_species(unit_expr: str) -> tuple[str, str | None]:
     """Split `unit_expr` to an expression without a unit mention, and maybe species."""
     if match := re.fullmatch("(.*)(CO2|C)(.*)", unit_expr):
         return f"{match.group(1)}{match.group(3)}", match.group(2)

message_ix_models/model/macro.py

@@ -9,7 +9,7 @@
 from functools import lru_cache
 from itertools import product
 from pathlib import Path
-from typing import TYPE_CHECKING, Literal, Optional, Union
+from typing import TYPE_CHECKING, Literal
 
 import pandas as pd
 
@@ -30,8 +30,8 @@
 def generate(
     parameter: Literal["aeei", "config", "depr", "drate", "lotol"],
     context: "Context",
-    commodities: Union[list[str], list["Code"]] = COMMODITY,
-    value: Optional[float] = None,
+    commodities: list[str] | list["Code"] = COMMODITY,
+    value: float | None = None,
 ) -> pd.DataFrame:
     """Generate uniform data for one :mod:`message_ix.macro` `parameter`.
 

message_ix_models/model/material/build.py

@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Mapping
-from typing import Any, Optional
+from typing import Any
 
 import message_ix
 
@@ -89,7 +89,7 @@ def build(
     scenario: message_ix.Scenario,
     old_calib: bool,
     modify_existing_constraints: bool = True,
-    iea_data_path: Optional[str] = None,
+    iea_data_path: str | None = None,
 ) -> message_ix.Scenario:
     """Set up materials accounting on `scenario`."""
     node_suffix = context.model.regions

message_ix_models/model/material/data_ammonia.py

@@ -6,7 +6,7 @@
 for ammonia fertilizer technologies, demand, trade, and related constraints.
 """
 
-from typing import TYPE_CHECKING, Any, Union, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import numpy as np
 import pandas as pd
@@ -386,7 +386,7 @@ def set_exp_imp_nodes(df: pd.DataFrame) -> None:
         df.loc[df["technology"].str.contains("import"), "node_origin"] = "R12_GLB"
 
 
-def read_demand() -> dict[str, Union[pd.DataFrame, pd.Series]]:
+def read_demand() -> dict[str, pd.DataFrame | pd.Series]:
     """Read and clean demand and trade data for ammonia fertilizer."""
 
     N_demand_GLO = pd.read_csv(

message_ix_models/model/material/data_other_industry.py

@@ -7,7 +7,7 @@
 """
 
 import os
-from typing import TYPE_CHECKING, List, Union
+from typing import TYPE_CHECKING, List
 
 import pandas as pd
 from message_ix.util import make_df
@@ -342,7 +342,7 @@ def modify_demand_and_hist_activity(scen: "Scenario") -> None:
 
 
 def get_hist_act_data(
-    map_fname: str, iea_data_path: str, years: Union[List[int], None] = None
+    map_fname: str, iea_data_path: str, years: List[int] | None = None
 ) -> pd.DataFrame:
     """Reads IEA DB, maps and aggregates variables to MESSAGE technologies.
 

message_ix_models/model/material/data_petro.py

@@ -6,7 +6,7 @@
 """
 
 from collections import defaultdict
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
 import pandas as pd
 from message_ix import make_df
@@ -253,7 +253,7 @@ def assign_input_outpt(
     split: str,
     param_name: str,
     regions: pd.DataFrame,
-    val: Union[float, int],
+    val: float | int,
     t: str,
     rg: str,
     global_region: str,