[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
calliope-project · Aug 2, 2024 · 0cb6209 · 0cb6209
1 parent 7e32a08
commit 0cb6209
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 43 deletions.
diff --git a/templates/models/techs/supply/biofuel.yaml.jinja b/templates/models/techs/supply/biofuel.yaml.jinja
@@ -13,4 +13,4 @@ locations:
         constraints:
             resource: {{ location.biofuel_potential_mwh_per_year / 8760 * scaling_factors.power }} # {{ (1 / scaling_factors.power) | unit("MWh") }}
             storage_cap_equals: {{ location.biofuel_potential_mwh_per_year / 2 * scaling_factors.power }} # {{ (1 / scaling_factors.power) | unit("MWh") }} (0.5x annual yield) # ASSUME < 1 for numerical range
-    {% endfor %}
+    {% endfor %}
diff --git a/tests/model/test_model.py b/tests/model/test_model.py
@@ -1,48 +1,40 @@
 import pandas as pd
 import pytest
 
-DEFAULT_TECHNOLOGIES = set(
-    [
-        "battery",
-        "hydrogen",
-        "open_field_pv",
-        "wind_onshore_competing",
-        "wind_onshore_monopoly",
-        "roof_mounted_pv",
-        "wind_offshore",
-        "hydro_run_of_river",
-        "hydro_reservoir",
-        "pumped_hydro",
-        "demand_elec",
-        "nuclear",
-    ]
-)
-DIRECTIONAL_PV = set(
-    [
-        "roof_mounted_pv_s_flat",
-        "roof_mounted_pv_n",
-        "roof_mounted_pv_e_w",
-    ]
-)
-HEAT_TECHS = set(
-    [
-        "biofuel_boiler",
-        "biofuel_tech_heat_to_demand",
-        "heat_pump",
-        "heat_pump_tech_heat_to_demand",
-        "electric_heater",
-        "electric_heater_tech_heat_to_demand",
-        "hp_heat_storage_small",
-        "electric_heater_heat_storage_small",
-        "biofuel_heat_storage_small",
-    ]
-)
-BIOFUEL_TECHS = set(
-    [
-        "biofuel_supply",
-        "electricity_from_biofuel",
-    ]
-)
+DEFAULT_TECHNOLOGIES = set([
+    "battery",
+    "hydrogen",
+    "open_field_pv",
+    "wind_onshore_competing",
+    "wind_onshore_monopoly",
+    "roof_mounted_pv",
+    "wind_offshore",
+    "hydro_run_of_river",
+    "hydro_reservoir",
+    "pumped_hydro",
+    "demand_elec",
+    "nuclear",
+])
+DIRECTIONAL_PV = set([
+    "roof_mounted_pv_s_flat",
+    "roof_mounted_pv_n",
+    "roof_mounted_pv_e_w",
+])
+HEAT_TECHS = set([
+    "biofuel_boiler",
+    "biofuel_tech_heat_to_demand",
+    "heat_pump",
+    "heat_pump_tech_heat_to_demand",
+    "electric_heater",
+    "electric_heater_tech_heat_to_demand",
+    "hp_heat_storage_small",
+    "electric_heater_heat_storage_small",
+    "biofuel_heat_storage_small",
+])
+BIOFUEL_TECHS = set([
+    "biofuel_supply",
+    "electricity_from_biofuel",
+])
 # Only includes scenarios with non-default technology sets
 TECHNOLOGIES = {
     "connected_all_neighbours": DEFAULT_TECHNOLOGIES | set(["ac_transmission"]),