Bump mypy, ruff versions

- mypy v1.13.0 → v1.14.0
  - Drop custom hook entry that uses PRE_COMMIT_MYPY_VENV.
  - Use config suggested at python/mypy#13916.
- ruff v0.7.4 → v0.9.1
  - Reformat 7 files.

Author: khaeru

.pre-commit-config.yaml

@@ -1,26 +1,19 @@
 repos:
-- repo: local
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.14.1
   hooks:
   - id: mypy
-    name: mypy
-    always_run: true
-    require_serial: true
     pass_filenames: false
-
-    language: python
-    entry: bash -c ". ${PRE_COMMIT_MYPY_VENV:-/dev/null}/bin/activate 2>/dev/null; mypy $0 $@; python -m pip list"
     additional_dependencies:
-    - mypy >= 1.13.0
+    - "ixmp @ git+https://github.com/iiasa/ixmp.git@main"
+    - "message-ix @ git+https://github.com/iiasa/message_ix.git@main"
     - plotnine
     - pytest
     - sdmx1
     - types-PyYAML
     - types-tqdm
-    - "ixmp @ git+https://github.com/iiasa/ixmp.git@main"
-    - "message-ix @ git+https://github.com/iiasa/message_ix.git@main"
-    args: ["."]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.7.4
+  rev: v0.9.1
   hooks:
   - id: ruff
   - id: ruff-format

message_ix_models/model/material/material_demand/material_demand_calc.py

@@ -100,7 +100,7 @@ def read_timer_pop(
     datapath: str | Path, material: Literal["cement", "steel", "aluminum"]
 ):
     df_population = pd.read_excel(
-        f'{datapath}/{material_data[material]["dir"]}{material_data[material]["file"]}',
+        f"{datapath}/{material_data[material]['dir']}{material_data[material]['file']}",
         sheet_name="Timer_POP",
         skiprows=[0, 1, 2, 30],
         nrows=26,
@@ -119,7 +119,7 @@ def read_timer_gdp(
 ):
     # Read GDP per capita data
     df_gdp = pd.read_excel(
-        f'{datapath}/{material_data[material]["dir"]}{material_data[material]["file"]}',
+        f"{datapath}/{material_data[material]['dir']}{material_data[material]['file']}",
         sheet_name="Timer_GDPCAP",
         skiprows=[0, 1, 2, 30],
         nrows=26,
@@ -195,7 +195,7 @@ def read_hist_mat_demand(material: Literal["cement", "steel", "aluminum"]):
     if material == "aluminum":
         df_raw_cons = (
             pd.read_excel(
-                f'{datapath}/{material_data[material]["dir"]}{material_data[material]["file"]}',
+                f"{datapath}/{material_data[material]['dir']}{material_data[material]['file']}",
                 sheet_name="final_table",
                 nrows=378,
             )
@@ -213,7 +213,7 @@ def read_hist_mat_demand(material: Literal["cement", "steel", "aluminum"]):
         )
     elif material == "steel":
         df_raw_cons = pd.read_excel(
-            f'{datapath}/{material_data[material]["dir"]}{material_data[material]["file"]}',
+            f"{datapath}/{material_data[material]['dir']}{material_data[material]['file']}",
             sheet_name="Consumption regions",
             nrows=26,
         )
@@ -246,7 +246,7 @@ def read_hist_mat_demand(material: Literal["cement", "steel", "aluminum"]):
         )
     elif material == "cement":
         df_raw_cons = pd.read_excel(
-            f'{datapath}/{material_data[material]["dir"]}{material_data[material]["file"]}',
+            f"{datapath}/{material_data[material]['dir']}{material_data[material]['file']}",
             sheet_name="Regions",
             skiprows=122,
             nrows=26,
@@ -358,7 +358,7 @@ def derive_demand(
 
     # get base year demand of material
     df_base_demand = read_base_demand(
-        f'{datapath}/{material_data[material]["dir"]}/demand_{material}.yaml'
+        f"{datapath}/{material_data[material]['dir']}/demand_{material}.yaml"
     )
 
     # get historical data (material consumption, pop, gdp)

message_ix_models/model/transport/report.py

@@ -281,7 +281,7 @@ def misc(c: "Computer") -> None:
     c.add("distance:nl:non-ldv", "distance_nonldv", "config")
 
     # Demand per capita
-    c.add("demand::capita", "div" "demand:n-c-y", "population:n-y")
+    c.add("demand::capita", "divdemand:n-c-y", "population:n-y")
 
     # Adjustment factor for LDV calibration: fuel economy ratio
     k_num = Key("in:nl-t-ya-c:transport+units") / "c"  # As in CONVERT_IAMC
@@ -379,7 +379,7 @@ def callback(rep: Reporter, context: Context) -> None:
         ],
     )
 
-    log.info(f"Added {len(rep.graph)-N_keys} keys")
+    log.info(f"Added {len(rep.graph) - N_keys} keys")
     # TODO Write an SVG visualization of reporting calculations
 
 

message_ix_models/model/water/build.py

@@ -77,9 +77,9 @@ def cat_tec_cooling(context: Context) -> tuple[pd.DataFrame, list[str]]:
     regions_df = df["node_loc"].unique().tolist()
 
     # Assertion check for valid data
-    assert (
-        len(parent_tech_sc) > 0
-    ), "No matching parent technologies found in the scenario."
+    assert len(parent_tech_sc) > 0, (
+        "No matching parent technologies found in the scenario."
+    )
     assert len(regions_df) > 0, "No unique nodes (regions) found in the scenario."
 
     # not filter cooling_tec with only parent_tech matching parent_tech_sc

message_ix_models/model/water/cli.py

@@ -252,8 +252,7 @@ def cooling(context, regions, rcps, rels):
     context.REL = rels
 
     log.info(
-        f"SSP assumption is {context.ssp}. "
-        f"RCP is {context.RCP}. REL is {context.REL}."
+        f"SSP assumption is {context.ssp}. RCP is {context.RCP}. REL is {context.REL}."
     )
 
     from .build import main as build

message_ix_models/model/water/report.py

@@ -1103,9 +1103,9 @@ def report(sc: Scenario, reg: str, sdgs: bool = False) -> None:
 
     pop_check = sc.timeseries(variable="Population")
     pop_check = pop_check[pop_check.year >= 2020]
-    assert (
-        not pop_check.empty
-    ), "The Population data does not exist or timeseries() has no future values"
+    assert not pop_check.empty, (
+        "The Population data does not exist or timeseries() has no future values"
+    )
 
     pop_drink_tot = pd.DataFrame()
     pop_sani_tot = pd.DataFrame()

message_ix_models/tests/model/test_disutility.py

@@ -239,9 +239,9 @@ def test_get_data(scenario, spec):
 
     # Test that the code will not encounter #45 / iiasa/ixmp#425
     for name, df in data.items():
-        assert (
-            "" not in df["unit"].unique()
-        ), f"{repr(name)} data has dimensionless units"
+        assert "" not in df["unit"].unique(), (
+            f"{repr(name)} data has dimensionless units"
+        )
 
 
 def test_get_spec(groups, techs, template):

message_ix_models/util/sdmx.py

@@ -165,7 +165,7 @@ def read(urn: str, base_dir: Optional["PathLike"] = None):
 
     if len(paths) > 1:
         log.info(
-            f"Match {paths[0].relative_to(base_dir)} for {urn!r}; {len(paths) -1 } "
+            f"Match {paths[0].relative_to(base_dir)} for {urn!r}; {len(paths) - 1} "
             "other result(s)"
         )