Merge remote-tracking branch 'origin/master'

polca · Oct 8, 2023 · 1215dbf · 1215dbf
2 parents 19f1d8e + 032521d
commit 1215dbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/premise/data_collection.py b/premise/data_collection.py
@@ -874,7 +874,9 @@ def get_iam_efficiencies(
             # efficiency expressed
             eff_data /= eff_data.sel(year=2020)
 
-            if len(efficiency_labels) == 0 or any("specific" in x.lower() for x in efficiency_labels.values()):
+            if len(efficiency_labels) == 0 or any(
+                "specific" in x.lower() for x in efficiency_labels.values()
+            ):
                 # we are dealing with specific energy consumption, not efficiencies
                 # we need to convert them to efficiencies
                 eff_data = 1 / eff_data

diff --git a/premise/report.py b/premise/report.py
@@ -296,8 +296,7 @@ def generate_summary_report(scenarios: list, filename: Path) -> None:
             variables = get_variables(filepath["filepath"])
             if "filter" in filepath:
                 variables = [
-                    x for x in variables
-                    if any(y in x for y in filepath["filter"])
+                    x for x in variables if any(y in x for y in filepath["filter"])
                 ]
 
         worksheet = workbook.create_sheet(sector)