diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3ffe8d9e8..7acbef9b0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -74,7 +74,7 @@ repos: # Format Snakemake rule / workflow files - repo: https://github.com/snakemake/snakefmt - rev: v0.10.1 + rev: v0.10.2 hooks: - id: snakefmt diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk index 8b06f915d..b415d2d92 100644 --- a/rules/build_electricity.smk +++ b/rules/build_electricity.smk @@ -396,7 +396,7 @@ rule add_electricity: else resources("networks/base.nc") ), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), regions=resources("regions_onshore.geojson"), powerplants=resources("powerplants.csv"), @@ -441,7 +441,7 @@ rule simplify_network: input: network=resources("networks/elec.nc"), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), regions_onshore=resources("regions_onshore.geojson"), regions_offshore=resources("regions_offshore.geojson"), @@ -489,7 +489,7 @@ rule cluster_network: else [] ), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), output: network=resources("networks/elec_s{simpl}_{clusters}.nc"), @@ -518,7 +518,7 @@ rule add_extra_components: input: network=resources("networks/elec_s{simpl}_{clusters}.nc"), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), output: resources("networks/elec_s{simpl}_{clusters}_ec.nc"), @@ -553,7 +553,7 @@ rule prepare_network: input: resources("networks/elec_s{simpl}_{clusters}_ec.nc"), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), co2_price=lambda w: resources("co2_price.csv") if "Ept" in w.opts else [], output: diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 64afdc137..d9ba58e26 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -249,7 +249,7 @@ if config["enable"]["retrieve"]: layer_path = ( f"/vsizip/{params.folder}/WDPA_{bYYYY}_Public_shp_{i}.zip" ) - print(f"Adding layer {i + 1} of 3 to combined output file.") + print(f"Adding layer {i+1} of 3 to combined output file.") shell("ogr2ogr -f gpkg -update -append {output.gpkg} {layer_path}") rule download_wdpa_marine: @@ -272,7 +272,7 @@ if config["enable"]["retrieve"]: for i in range(3): # vsizip is special driver for directly working with zipped shapefiles in ogr2ogr layer_path = f"/vsizip/{params.folder}/WDPA_WDOECM_{bYYYY}_Public_marine_shp_{i}.zip" - print(f"Adding layer {i + 1} of 3 to combined output file.") + print(f"Adding layer {i+1} of 3 to combined output file.") shell("ogr2ogr -f gpkg -update -append {output.gpkg} {layer_path}") diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index 6999cafe3..76e16716a 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -111,16 +111,12 @@ def add_brownfield(n, n_p, year): .groupby(level=0) .sum() ) - remaining_capacity = ( - pipe_capacity - - CH4_per_H2 - * already_retrofitted.reindex(index=pipe_capacity.index).fillna(0) - ) + remaining_capacity = pipe_capacity - CH4_per_H2 * already_retrofitted.reindex( + index=pipe_capacity.index + ).fillna(0) n.links.loc[gas_pipes_i, "p_nom"] = remaining_capacity else: - new_pipes = n.links.carrier.isin(pipe_carrier) & ( - n.links.build_year == year - ) + new_pipes = n.links.carrier.isin(pipe_carrier) & (n.links.build_year == year) n.links.loc[new_pipes, "p_nom"] = 0.0 n.links.loc[new_pipes, "p_nom_min"] = 0.0