Merge branch 'master' into ci-config

config.default.yaml

@@ -292,14 +292,14 @@ solving:
     min_iterations: 4
     max_iterations: 6
     keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
+    - Bus
+    - Line
+    - Link
+    - Transformer
+    - GlobalConstraint
+    - Generator
+    - Store
+    - StorageUnit
 
   solver:
     name: gurobi

scripts/solve_network.py

@@ -373,9 +373,11 @@ def extra_functionality(n, snapshots):
 
 
 def solve_network(n, config, opts="", **kwargs):
-    set_of_options = config['solving']['solver']['options']
-    solver_options = config['solving']["solver_options"][set_of_options] if set_of_options else {}
-    solver_name = config['solving']['solver']['name']
+    set_of_options = config["solving"]["solver"]["options"]
+    solver_options = (
+        config["solving"]["solver_options"][set_of_options] if set_of_options else {}
+    )
+    solver_name = config["solving"]["solver"]["name"]
     cf_solving = config["solving"]["options"]
     track_iterations = cf_solving.get("track_iterations", False)
     min_iterations = cf_solving.get("min_iterations", 4)
@@ -420,7 +422,7 @@ if __name__ == "__main__":
     if tmpdir is not None:
         Path(tmpdir).mkdir(parents=True, exist_ok=True)
     opts = snakemake.wildcards.opts.split("-")
-    solve_opts = snakemake.config['solving']['options']
+    solve_opts = snakemake.config["solving"]["options"]
 
     fn = getattr(snakemake.log, "memory", None)
     with memory_logger(filename=fn, interval=30.0) as mem: