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

polca · Aug 4, 2023 · bd12bbc · bd12bbc
2 parents bea2a39 + 025c8e6
commit bd12bbc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/premise/fuels.py b/premise/fuels.py
@@ -347,9 +347,15 @@ def __init__(
         }
 
         self.iam_fuel_markets = self.iam_data.production_volumes.sel(
-            variables=[g for g in [item for sublist in list(self.fuel_groups.values()) for item in sublist]
-                       if g in self.iam_data.production_volumes.variables.values.tolist()
-                       ]
+            variables=[
+                g
+                for g in [
+                    item
+                    for sublist in list(self.fuel_groups.values())
+                    for item in sublist
+                ]
+                if g in self.iam_data.production_volumes.variables.values.tolist()
+            ]
         )
 
         self.fuel_efficiencies = xr.DataArray(

diff --git a/premise/transformation.py b/premise/transformation.py
@@ -326,7 +326,9 @@ def select_multiple_suppliers(
 
         if exclude_region:
             extra_filters.append(
-                ws.exclude(ws.either(*[ws.contains("location", x) for x in exclude_region]))
+                ws.exclude(
+                    ws.either(*[ws.contains("location", x) for x in exclude_region])
+                )
             )
 
         try: