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

for more information, see https://pre-commit.ci

rules/build_sector.smk

@@ -90,13 +90,10 @@ rule build_gas_input_locations:
         ),
         entry="data/gas_network/scigrid-gas/data/IGGIELGN_BorderPoints.geojson",
         storage="data/gas_network/scigrid-gas/data/IGGIELGN_Storages.geojson",
-        regions_onshore=RESOURCES
+        regions_onshore=RESOURCES + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
-        + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
+        regions_offshore=RESOURCES + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
-        regions_offshore=RESOURCES
-        + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
     output:
-        gas_input_nodes=RESOURCES
+        gas_input_nodes=RESOURCES + "gas_input_locations_s{simpl}_{clusters}.geojson",
-        + "gas_input_locations_s{simpl}_{clusters}.geojson",
         gas_input_nodes_simplified=RESOURCES
         + "gas_input_locations_s{simpl}_{clusters}_simplified.csv",
     resources:
@@ -112,10 +109,8 @@ rule build_gas_input_locations:
 rule cluster_gas_network:
     input:
         cleaned_gas_network=RESOURCES + "gas_network.csv",
-        regions_onshore=RESOURCES
+        regions_onshore=RESOURCES + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
-        + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
+        regions_offshore=RESOURCES + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
-        regions_offshore=RESOURCES
-        + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
     output:
         clustered_gas_network=RESOURCES + "gas_network_elec_s{simpl}_{clusters}.csv",
     resources:

rules/common.smk

@@ -4,7 +4,7 @@
 
 import os, sys, glob
 
-helper_source_path = [match for match in glob.glob('**/_helpers.py', recursive=True)]
+helper_source_path = [match for match in glob.glob("**/_helpers.py", recursive=True)]
 
 for path in helper_source_path:
     path = os.path.dirname(os.path.abspath(path))

rules/retrieve.smk

@@ -163,7 +163,6 @@ if config["enable"]["retrieve"] and config["enable"].get(
 
 
 if config["enable"]["retrieve"]:
-
     datafiles = [
         "IGGIELGN_LNGs.geojson",
         "IGGIELGN_BorderPoints.geojson",

scripts/add_brownfield.py

@@ -133,9 +133,7 @@ def disable_grid_expansion_if_LV_limit_hit(n):
 
     # allow small numerical differences
     if lv_limit - total_expansion < 1:
-        logger.info(
+        logger.info(f"LV is already reached, disabling expansion and LV limit")
-            f"LV is already reached, disabling expansion and LV limit"
-        )
         extendable_acs = n.lines.query("s_nom_extendable").index
         n.lines.loc[extendable_acs, "s_nom_extendable"] = False
         n.lines.loc[extendable_acs, "s_nom"] = n.lines.loc[extendable_acs, "s_nom_min"]

scripts/prepare_sector_network.py

@@ -2998,8 +2998,9 @@ def add_industry(n, costs):
 
     if options["co2_spatial"] or options["co2network"]:
         p_set = (
-            -industrial_demand.loc[nodes, "process emission"]
+            -industrial_demand.loc[nodes, "process emission"].rename(
-            .rename(index=lambda x: x + " process emissions")
+                index=lambda x: x + " process emissions"
+            )
             / nhours
         )
     else:
@@ -3412,6 +3413,7 @@ def cluster_heat_buses(n):
         pnl = c.pnl
         agg = define_clustering(pd.Index(pnl.keys()), aggregate_dict)
         for k in pnl.keys():
+
             def renamer(s):
                 return s.replace("residential ", "").replace("services ", "")
 

scripts/solve_network.py

@@ -856,7 +856,7 @@ def solve_network(n, config, solving, opts="", **kwargs):
     kwargs["assign_all_duals"] = cf_solving.get("assign_all_duals", False)
 
     if kwargs["solver_name"] == "gurobi":
-        logging.getLogger('gurobipy').setLevel(logging.CRITICAL)
+        logging.getLogger("gurobipy").setLevel(logging.CRITICAL)
 
     rolling_horizon = cf_solving.pop("rolling_horizon", False)
     skip_iterations = cf_solving.pop("skip_iterations", False)