[pre-commit.ci] pre-commit autoupdate (#965)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 23.12.1 → 24.1.1](psf/black@23.12.1...24.1.1)
- [github.com/snakemake/snakefmt: v0.9.0 → v0.10.0](snakemake/snakefmt@v0.9.0...v0.10.0)

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.pre-commit-config.yaml

@@ -49,7 +49,7 @@ repos:
 
 # Formatting with "black" coding style
 - repo: https://github.com/psf/black
-  rev: 23.12.1
+  rev: 24.1.1
   hooks:
   # Format Python files
   - id: black
@@ -72,7 +72,7 @@ repos:
 
 # Format Snakemake rule / workflow files
 - repo: https://github.com/snakemake/snakefmt
-  rev: v0.9.0
+  rev: v0.10.0
   hooks:
   - id: snakefmt
 

Snakefile

@@ -105,7 +105,7 @@ rule solve_all_networks:
     input:
         expand(
             "results/" + RDIR + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
-            **config["scenario"]
+            **config["scenario"],
         ),
 
 
@@ -116,7 +116,7 @@ rule plot_all_p_nom:
             + RDIR
             + "plots/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_p_nom.{ext}",
             **config["scenario"],
-            ext=["png", "pdf"]
+            ext=["png", "pdf"],
         ),
 
 
@@ -127,7 +127,7 @@ rule make_all_summaries:
             + RDIR
             + "summaries/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{country}",
             **config["scenario"],
-            country=["all"] + config["countries"]
+            country=["all"] + config["countries"],
         ),
 
 
@@ -140,7 +140,7 @@ rule plot_all_summaries:
             summary=["energy", "costs"],
             **config["scenario"],
             country=["all"] + config["countries"],
-            ext=["png", "pdf"]
+            ext=["png", "pdf"],
         ),
 
 
@@ -867,7 +867,7 @@ if config["monte_carlo"]["options"].get("add_to_snakefile", False) == True:
                 "networks/"
                 + RDIR
                 + "elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{unc}.nc",
-                **config["scenario"]
+                **config["scenario"],
             ),
 
     rule solve_network:
@@ -912,7 +912,7 @@ if config["monte_carlo"]["options"].get("add_to_snakefile", False) == True:
                 "results/"
                 + RDIR
                 + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_{unc}.nc",
-                **config["scenario"]
+                **config["scenario"],
             ),
 
 
@@ -930,7 +930,7 @@ def input_make_summary(w):
         **{
             k: config["scenario"][k] if getattr(w, k) == "all" else getattr(w, k)
             for k in ["simpl", "clusters", "opts"]
-        }
+        },
     )
 
 

scripts/build_shapes.py

@@ -393,9 +393,9 @@ def eez(
 
     # repeat to simplify after the buffer correction
     ret_df_new = ret_df_new.map(
-        lambda x: x
-        if x is None
-        else _simplify_polys(x, minarea=minarea, tolerance=tolerance)
+        lambda x: (
+            x if x is None else _simplify_polys(x, minarea=minarea, tolerance=tolerance)
+        )
     )
     ret_df_new = ret_df_new.apply(lambda x: x if x is None else make_valid(x))
 

scripts/clean_osm_data.py

@@ -809,9 +809,11 @@ def create_extended_country_shapes(country_shapes, offshore_shapes, tolerance=0.
             {
                 "name": list(country_shapes.index),
                 "geometry": [
-                    c_geom.unary_union(offshore_shapes[c_code])
-                    if c_code in offshore_shapes
-                    else c_geom
+                    (
+                        c_geom.unary_union(offshore_shapes[c_code])
+                        if c_code in offshore_shapes
+                        else c_geom
+                    )
                     for c_code, c_geom in country_shapes.items()
                 ],
             },

scripts/cluster_network.py

@@ -531,15 +531,15 @@ def busmap_for_country(x):
                 n,
                 n_cluster_c,
                 buses_i=x.index,
-                feature=feature.loc[x.index]
+                feature=feature.loc[x.index],
                 # n, n_clusters[x.name], buses_i=x.index, feature=feature.loc[x.index]
             )
         elif algorithm == "modularity":
             return prefix + busmap_by_greedy_modularity(
                 # TODO Check consistency (fix for TypeError: 'int' object is not subscriptable in case of a single country)
                 n,
                 n_cluster_c,
-                buses_i=x.index
+                buses_i=x.index,
                 # n, n_clusters[x.name], buses_i=x.index
             )
         else:

scripts/simplify_network.py

@@ -569,9 +569,9 @@ def aggregate_to_substations(n, aggregation_strategies=dict(), buses_i=None):
         dijkstra(adj, directed=False, indices=bus_indexer), buses_i, n.buses.index
     )
 
-    dist[
-        buses_i
-    ] = np.inf  # bus in buses_i should not be assigned to different bus in buses_i
+    dist[buses_i] = (
+        np.inf
+    )  # bus in buses_i should not be assigned to different bus in buses_i
 
     # avoid assignment a bus to a wrong country
     for c in n.buses.country.unique():

scripts/solve_network.py

@@ -563,9 +563,9 @@ def solve_network(n, config, opts="", **kwargs):
 
     n = pypsa.Network(snakemake.input[0])
     if snakemake.params.augmented_line_connection.get("add_to_snakefile"):
-        n.lines.loc[
-            n.lines.index.str.contains("new"), "s_nom_min"
-        ] = snakemake.params.augmented_line_connection.get("min_expansion")
+        n.lines.loc[n.lines.index.str.contains("new"), "s_nom_min"] = (
+            snakemake.params.augmented_line_connection.get("min_expansion")
+        )
     n = prepare_network(n, solve_opts)
 
     n = solve_network(