Support mypy 1.12

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
     language: python
     entry: bash -c ". ${PRE_COMMIT_MYPY_VENV:-/dev/null}/bin/activate 2>/dev/null; mypy $0 $@"
     additional_dependencies:
-    - mypy >= 1.9.0
+    - mypy >= 1.12.0
     - asyncssh
     - git+https://github.com/iiasa/ixmp.git@main
     - importlib_resources
@@ -22,7 +22,7 @@ repos:
     - types-requests
     args: ["."]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.3.4
+  rev: v0.6.9
   hooks:
   - id: ruff
   - id: ruff-format

message_ix/tools/add_year/__init__.py

@@ -218,9 +218,9 @@ def add_year(
     cat_year_new: pd.DataFrame = sc_new.set("cat_year")
     firstmodelyear_new = cat_year_new.query("type_year == 'firstmodelyear'")
     firstyr_new: int = (
-        min(cat_year_new["year"])
+        int(min(cat_year_new["year"]))
         if firstmodelyear_new.empty
-        else firstmodelyear_new["year"]
+        else int(firstmodelyear_new["year"].item())
     )  # type: ignore
     # assert isinstance(firstyear_new, int)
 

pyproject.toml

@@ -88,6 +88,8 @@ omit = [
 
 [tool.mypy]
 exclude = ["doc/"]
+# TODO Remove this once it has become default with mypy 2.0:
+local_partial_types = true
 
 [[tool.mypy.overrides]]
 # Packages/modules for which no type hints are available.

tutorial/westeros/westeros_report.ipynb

@@ -118,10 +118,12 @@
     "rep.add(\"A\", 1)\n",
     "rep.add(\"B\", 2)\n",
     "\n",
+    "\n",
     "# Add one node and two edges\n",
     "def add(*inputs):\n",
     "    return sum(inputs)\n",
     "\n",
+    "\n",
     "rep.add(\"C\", add, \"A\", \"B\")"
    ]
   },
@@ -284,6 +286,7 @@
     "def ratio(a, b):\n",
     "    return a / b\n",
     "\n",
+    "\n",
     "# Add your code here:"
    ]
   },