From f4f4c1bf375eff2cedf15027afd889db1041a527 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 17:26:39 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- rules/build_electricity.smk | 26 ++++++-------------------- rules/collect.smk | 7 ++----- rules/solve_electricity.smk | 18 +++++------------- scripts/build_hydro_profile.py | 2 +- 4 files changed, 14 insertions(+), 39 deletions(-) diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk index ab7b1913..a9499428 100644 --- a/rules/build_electricity.smk +++ b/rules/build_electricity.smk @@ -496,9 +496,7 @@ rule simplify_network: output: network=resources("networks/elec_s{simpl}.nc"), regions_onshore=resources("regions_onshore_elec_s{simpl}.geojson"), - regions_offshore=resources( - "regions_offshore_elec_s{simpl}.geojson" - ), + regions_offshore=resources("regions_offshore_elec_s{simpl}.geojson"), busmap=resources("busmap_elec_s{simpl}.csv"), connection_costs=resources("connection_costs_s{simpl}.csv"), log: @@ -532,9 +530,7 @@ rule cluster_network: input: network=resources("networks/elec_s{simpl}.nc"), regions_onshore=resources("regions_onshore_elec_s{simpl}.geojson"), - regions_offshore=resources( - "regions_offshore_elec_s{simpl}.geojson" - ), + regions_offshore=resources("regions_offshore_elec_s{simpl}.geojson"), busmap=ancient(resources("busmap_elec_s{simpl}.csv")), custom_busmap=lambda w: ( "data/custom_busmap_elec_s{simpl}_{clusters}.csv" @@ -546,12 +542,8 @@ rule cluster_network: ), output: network=resources("networks/elec_s{simpl}_{clusters}.nc"), - regions_onshore=resources( - "regions_onshore_elec_s{simpl}_{clusters}.geojson" - ), - regions_offshore=resources( - "regions_offshore_elec_s{simpl}_{clusters}.geojson" - ), + regions_onshore=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"), + regions_offshore=resources("regions_offshore_elec_s{simpl}_{clusters}.geojson"), busmap=resources("busmap_elec_s{simpl}_{clusters}.csv"), linemap=resources("linemap_elec_s{simpl}_{clusters}.csv"), log: @@ -615,15 +607,9 @@ rule prepare_network: output: resources("networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"), log: - logs( - "prepare_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.log" - ), + logs("prepare_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.log"), benchmark: - ( - benchmarks( - "prepare_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}" - ) - ) + (benchmarks("prepare_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}")) threads: 1 resources: mem_mb=4000, diff --git a/rules/collect.smk b/rules/collect.smk index ef63df0f..214b8102 100644 --- a/rules/collect.smk +++ b/rules/collect.smk @@ -34,9 +34,7 @@ rule extra_components_networks: rule prepare_elec_networks: input: expand( - resources( - "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc" - ), + resources("networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"), **config["scenario"], run=config["run"]["name"], ), @@ -55,8 +53,7 @@ rule prepare_sector_networks: rule solve_elec_networks: input: expand( - RESULTS - + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", + RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", **config["scenario"], run=config["run"]["name"], ), diff --git a/rules/solve_electricity.smk b/rules/solve_electricity.smk index 5c6777d4..81d07993 100644 --- a/rules/solve_electricity.smk +++ b/rules/solve_electricity.smk @@ -13,13 +13,10 @@ rule solve_network: ), custom_extra_functionality=input_custom_extra_functionality, input: - network=resources( - "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc" - ), + network=resources("networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"), config=RESULTS + "config.yaml", output: - network=RESULTS - + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", + network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", log: solver=normpath( RESULTS @@ -28,10 +25,7 @@ rule solve_network: python=RESULTS + "logs/solve_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_python.log", benchmark: - ( - RESULTS - + "benchmarks/solve_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}" - ) + (RESULTS + "benchmarks/solve_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}") threads: solver_threads resources: mem_mb=memory, @@ -48,11 +42,9 @@ rule solve_operations_network: params: options=config_provider("solving", "options"), input: - network=RESULTS - + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", + network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", output: - network=RESULTS - + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_op.nc", + network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_op.nc", log: solver=normpath( RESULTS diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py index a732cf45..ce8f3a4c 100644 --- a/scripts/build_hydro_profile.py +++ b/scripts/build_hydro_profile.py @@ -65,8 +65,8 @@ import atlite import country_converter as coco import geopandas as gpd import pandas as pd -from numpy.polynomial import Polynomial from _helpers import configure_logging, set_scenario_config +from numpy.polynomial import Polynomial cc = coco.CountryConverter()