From f876d78ed4cfbc2d14d424066b25a598abc8deb3 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 19 Jan 2024 10:34:49 +0100 Subject: [PATCH] fix linting: run ruff --- scripts/_helpers.py | 2 -- scripts/add_brownfield.py | 4 ++-- scripts/build_electricity_demand.py | 1 - scripts/build_line_rating.py | 1 - scripts/build_renewable_profiles.py | 2 +- scripts/copy_config.py | 2 -- scripts/make_summary_perfect.py | 10 ++-------- scripts/plot_network.py | 1 - scripts/plot_summary.py | 1 - scripts/plot_validation_electricity_prices.py | 1 - scripts/prepare_network.py | 1 - scripts/simplify_network.py | 2 +- scripts/solve_network.py | 2 +- 13 files changed, 7 insertions(+), 23 deletions(-) diff --git a/scripts/_helpers.py b/scripts/_helpers.py index c5c96db9..67b20877 100644 --- a/scripts/_helpers.py +++ b/scripts/_helpers.py @@ -15,8 +15,6 @@ import pandas as pd import pytz import requests import yaml -from pypsa.components import component_attrs, components -from pypsa.descriptors import Dict from tqdm import tqdm logger = logging.getLogger(__name__) diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index cb1f51c8..229b8b07 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -121,7 +121,7 @@ def add_brownfield(n, n_p, year): def disable_grid_expansion_if_LV_limit_hit(n): - if not "lv_limit" in n.global_constraints.index: + if "lv_limit" not in n.global_constraints.index: return total_expansion = ( @@ -133,7 +133,7 @@ def disable_grid_expansion_if_LV_limit_hit(n): # allow small numerical differences if lv_limit - total_expansion < 1: - logger.info(f"LV is already reached, disabling expansion and LV limit") + logger.info("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"] diff --git a/scripts/build_electricity_demand.py b/scripts/build_electricity_demand.py index d7d9927d..4706bf58 100755 --- a/scripts/build_electricity_demand.py +++ b/scripts/build_electricity_demand.py @@ -42,7 +42,6 @@ Outputs import logging logger = logging.getLogger(__name__) -import dateutil import numpy as np import pandas as pd from _helpers import configure_logging diff --git a/scripts/build_line_rating.py b/scripts/build_line_rating.py index 589f3656..4d45b910 100755 --- a/scripts/build_line_rating.py +++ b/scripts/build_line_rating.py @@ -50,7 +50,6 @@ With a heat balance considering the maximum temperature threshold of the transmi the maximal possible capacity factor "s_max_pu" for each transmission line at each time step is calculated. """ -import logging import re import atlite diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py index f9db9271..6c450aca 100644 --- a/scripts/build_renewable_profiles.py +++ b/scripts/build_renewable_profiles.py @@ -340,7 +340,7 @@ if __name__ == "__main__": f"Completed weighted capacity factor time series calculation ({duration:2.2f}s)" ) - logger.info(f"Calculating maximal capacity per bus") + logger.info("Calculating maximal capacity per bus") p_nom_max = capacity_per_sqkm * availability @ area logger.info("Calculate average distances.") diff --git a/scripts/copy_config.py b/scripts/copy_config.py index a549d893..3dbee6a4 100644 --- a/scripts/copy_config.py +++ b/scripts/copy_config.py @@ -6,8 +6,6 @@ Copy used configuration files and important scripts for archiving. """ -from pathlib import Path -from shutil import copy import yaml diff --git a/scripts/make_summary_perfect.py b/scripts/make_summary_perfect.py index c387c6cf..93411a4c 100644 --- a/scripts/make_summary_perfect.py +++ b/scripts/make_summary_perfect.py @@ -12,15 +12,9 @@ other metrics. import numpy as np import pandas as pd import pypsa -from make_summary import ( - assign_carriers, - assign_locations, - calculate_cfs, - calculate_nodal_cfs, - calculate_nodal_costs, -) +from make_summary import assign_carriers, assign_locations from prepare_sector_network import prepare_costs -from pypsa.descriptors import get_active_assets, nominal_attrs +from pypsa.descriptors import get_active_assets from six import iteritems idx = pd.IndexSlice diff --git a/scripts/plot_network.py b/scripts/plot_network.py index 63b5d848..b34ba432 100644 --- a/scripts/plot_network.py +++ b/scripts/plot_network.py @@ -903,7 +903,6 @@ def plot_series(network, carrier="AC", name="test"): carrier, start, stop, - name, ), transparent=True, ) diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py index 2a6c9f15..d29207af 100644 --- a/scripts/plot_summary.py +++ b/scripts/plot_summary.py @@ -12,7 +12,6 @@ logger = logging.getLogger(__name__) import matplotlib.gridspec as gridspec import matplotlib.pyplot as plt -import numpy as np import pandas as pd plt.style.use("ggplot") diff --git a/scripts/plot_validation_electricity_prices.py b/scripts/plot_validation_electricity_prices.py index 2a187b9f..38c9fe96 100644 --- a/scripts/plot_validation_electricity_prices.py +++ b/scripts/plot_validation_electricity_prices.py @@ -9,7 +9,6 @@ import pandas as pd import pypsa import seaborn as sns from _helpers import configure_logging -from pypsa.statistics import get_bus_and_carrier sns.set_theme("paper", style="whitegrid") diff --git a/scripts/prepare_network.py b/scripts/prepare_network.py index 632e6078..75e5daba 100755 --- a/scripts/prepare_network.py +++ b/scripts/prepare_network.py @@ -58,7 +58,6 @@ Description """ import logging -import re import numpy as np import pandas as pd diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index f88d10d4..f8629ea7 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -86,7 +86,7 @@ The rule :mod:`simplify_network` does up to four things: """ import logging -from functools import partial, reduce +from functools import reduce import numpy as np import pandas as pd diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 55704d4d..c6c1b10c 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -690,7 +690,7 @@ def add_battery_constraints(n): def add_lossy_bidirectional_link_constraints(n): - if not n.links.p_nom_extendable.any() or not "reversed" in n.links.columns: + if not n.links.p_nom_extendable.any() or "reversed" not in n.links.columns: return n.links["reversed"] = n.links.reversed.fillna(0).astype(bool)