Merge remote-tracking branch 'origin/TIAM' into TIAM

polca · Oct 3, 2023 · f660972 · f660972
2 parents 9f28144 + a46ca22
commit f660972
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/premise/activity_maps.py b/premise/activity_maps.py
@@ -120,7 +120,9 @@ class InventorySet:
     These functions return the result of applying :func:`act_fltr` to the filter dictionaries.
     """
 
-    def __init__(self, database: List[dict], version: str = None, model: str = None) -> None:
+    def __init__(
+        self, database: List[dict], version: str = None, model: str = None
+    ) -> None:
         self.database = database
         self.version = version
         self.model = model
@@ -261,7 +263,9 @@ def generate_sets_from_filters(self, filtr: dict, database=None) -> dict:
             for tech, fltr in filtr.items()
         }
 
-        mapping = {tech: {act["name"] for act in actlst} for tech, actlst in techs.items()}
+        mapping = {
+            tech: {act["name"] for act in actlst} for tech, actlst in techs.items()
+        }
 
         # check if all keys have values
         # if not, print warning

diff --git a/premise/electricity.py b/premise/electricity.py
@@ -1661,7 +1661,7 @@ def create_region_specific_power_plants(self):
             "Oil ST",
             "Oil CC",
             "Coal CF 80-20",
-            "Coal CF 50-50"
+            "Coal CF 50-50",
         ]
 
         list_datasets_to_duplicate = [