Satisfy mypy in __init___, .model.dantzig

iiasa · May 9, 2022 · 2a45f09 · 2a45f09
1 parent edd1568
commit 2a45f09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/ixmp/__init__.py b/ixmp/__init__.py
@@ -37,16 +37,14 @@
 BACKENDS["jdbc"] = JDBCBackend
 
 # Register Models provided by ixmp
-MODELS.update(
-    {
-        "default": GAMSModel,
-        "gams": GAMSModel,
-        "dantzig": DantzigGAMSModel,
-        "dantzig-gams": DantzigGAMSModel,
-        "dantzig-pyomo": DantzigPyomoModel,
-    }
-)
-
+for name, cls in (
+    ("default", GAMSModel),
+    ("gams", GAMSModel),
+    ("dantzig", DantzigGAMSModel),
+    ("dantzig-gams", DantzigGAMSModel),
+    ("dantzig-pyomo", DantzigPyomoModel),
+):
+    MODELS[name] = cls
 
 # Configure the 'ixmp' logger: write messages to stdout, defaulting to level WARNING
 # and above

diff --git a/ixmp/model/dantzig.py b/ixmp/model/dantzig.py
@@ -1,15 +1,16 @@
 from collections import ChainMap
 from functools import lru_cache
 from pathlib import Path
+from typing import Dict
 
 import pandas as pd
 
 from ixmp.utils import maybe_check_out, maybe_commit, update_par
+
 from .gams import GAMSModel
 from .pyomo import PyomoModel
 
-
-ITEMS = {
+ITEMS: Dict[str, dict] = {
     # Plants
     "i": dict(ix_type="set"),
     # Markets