Merge pull request #443 from iiasa/python-3.14

Confirm support for Python 3.14, drop 3.9

Author: khaeru

.github/workflows/pytest-snapshots.yaml

@@ -15,7 +15,7 @@ concurrency:
 
 env:
   gams-version: 43.4.1
-  python-version: "3.13"
+  python-version: "3.14"
   upstream: main
 
 jobs:

.github/workflows/pytest.yaml

@@ -22,7 +22,7 @@ defaults:
 env:
   gams-version: 43.4.1
   label: "safe to test"
-  python-version: "3.13"
+  python-version: "3.14"
 
 jobs:
   check:
@@ -98,13 +98,13 @@ jobs:
         # - Latest supported Python version for those or other dependencies.
         # Minimum version given in pyproject.toml + earlier version of Python
         # For this job only, the oldest version of Python supported by message-ix-models
-        - { upstream: v3.8.0,  python: "3.9"  }  # Released 2024-01-12
-        - { upstream: v3.9.0,  python: "3.13" }  # 2024-06-04
-        - { upstream: v3.10.0, python: "3.13" }  # 2025-02-21
+        - { upstream: v3.8.0,  python: "3.10"  }  # Released 2024-01-12
+        - { upstream: v3.9.0,  python: "3.14" }  # 2024-06-04
+        - { upstream: v3.10.0, python: "3.14" }  # 2025-02-21
         # Latest released version + latest released Python
-        - { upstream: v3.11.0, python: "3.13" }  # 2025-05-27
+        - { upstream: v3.11.0, python: "3.14" }  # 2025-05-27
         # Development version + latest released Python
-        - { upstream: main,    python: "3.13" }
+        - { upstream: main,    python: "3.14" }
 
         exclude:
         # Specific version combinations that are invalid / not to be used

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")

doc/whatsnew.rst

@@ -4,6 +4,8 @@ What's new
 Next release
 ============
 
+- :mod:`message_ix_models` is tested and compatible with `Python 3.14 <https://www.python.org/downloads/release/python-3140/>`__ (:pull:`443`).
+- Support for Python 3.9 is dropped (:pull:`443`), as it has reached end-of-life.
 - Fix water module reporting failures and improve calculations (:issue:`407`, :pull:`396`).
 - Improve and extend :doc:`/material/index` (:pull:`418`).
   See :doc:`version 1.2.0 </material/v1.2.0>` for details.

message_ix_models/data/test/transport/MESSAGEix-Transport R12 YB 3594a_baseline.xlsx renamed to message_ix_models/data/test/transport/MESSAGEix-Transport R12 YB e92ae_baseline.xlsx

@@ -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/build.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/buildings/__init__.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/config.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/emissions.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`.