diff --git a/doc/conf.py b/doc/conf.py index 35451be2..df787873 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -18,7 +18,6 @@ # serve to show the default. import os -import shlex import sys # If extensions (or modules to document with autodoc) are in another directory, diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index 51c5d066..96360509 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -13,7 +13,6 @@ idx = pd.IndexSlice import numpy as np import pypsa -import yaml from _helpers import override_component_attrs, update_config_with_sector_opts from add_existing_baseyear import add_build_year_to_new_assets diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index 6daf0111..006c8586 100755 --- a/scripts/add_electricity.py +++ b/scripts/add_electricity.py @@ -606,7 +606,7 @@ def attach_extendable_generators(n, costs, ppl, carriers): else: raise NotImplementedError( - f"Adding extendable generators for carrier " + "Adding extendable generators for carrier " "'{tech}' is not implemented, yet. " "Only OCGT, CCGT and nuclear are allowed at the moment." ) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 07389986..89215bad 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -16,7 +16,6 @@ from types import SimpleNamespace import numpy as np import pypsa import xarray as xr -import yaml from _helpers import override_component_attrs, update_config_with_sector_opts from prepare_sector_network import cluster_heat_buses, define_spatial, prepare_costs diff --git a/scripts/build_bus_regions.py b/scripts/build_bus_regions.py index bbff2bc6..bc9826fb 100644 --- a/scripts/build_bus_regions.py +++ b/scripts/build_bus_regions.py @@ -43,7 +43,6 @@ Description """ import logging -import os import geopandas as gpd import numpy as np diff --git a/scripts/build_gas_input_locations.py b/scripts/build_gas_input_locations.py index 86d477db..983a3439 100644 --- a/scripts/build_gas_input_locations.py +++ b/scripts/build_gas_input_locations.py @@ -15,7 +15,6 @@ logger = logging.getLogger(__name__) import geopandas as gpd import pandas as pd from cluster_gas_network import load_bus_regions -from shapely import wkt def read_scigrid_gas(fn): diff --git a/scripts/build_load_data.py b/scripts/build_load_data.py index 986892fc..51392f2e 100755 --- a/scripts/build_load_data.py +++ b/scripts/build_load_data.py @@ -77,8 +77,10 @@ def load_timeseries(fn, years, countries, powerstatistics=True): pattern = "power_statistics" if powerstatistics else "transparency" pattern = f"_load_actual_entsoe_{pattern}" - rename = lambda s: s[: -len(pattern)] - date_parser = lambda x: dateutil.parser.parse(x, ignoretz=True) + def rename(s): + return s[:-len(pattern)] + def date_parser(x): + return dateutil.parser.parse(x, ignoretz=True) return ( pd.read_csv(fn, index_col=0, parse_dates=[0], date_parser=date_parser) .filter(like=pattern) diff --git a/scripts/build_population_layouts.py b/scripts/build_population_layouts.py index 1325d20d..e3ac8f45 100644 --- a/scripts/build_population_layouts.py +++ b/scripts/build_population_layouts.py @@ -11,7 +11,6 @@ import logging logger = logging.getLogger(__name__) -import multiprocessing as mp import atlite import geopandas as gpd diff --git a/scripts/make_summary.py b/scripts/make_summary.py index 8fd2ab01..b58ba698 100644 --- a/scripts/make_summary.py +++ b/scripts/make_summary.py @@ -12,7 +12,6 @@ import sys import numpy as np import pandas as pd import pypsa -import yaml from _helpers import override_component_attrs from prepare_sector_network import prepare_costs @@ -708,5 +707,5 @@ if __name__ == "__main__": if snakemake.config["foresight"] == "myopic": cumulative_cost = calculate_cumulative_cost() cumulative_cost.to_csv( - f"results/" + snakemake.params.RDIR + "/csvs/cumulative_cost.csv" + "results/" + snakemake.params.RDIR + "/csvs/cumulative_cost.csv" ) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 24e819a6..87f148ec 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -741,9 +741,8 @@ def prepare_costs(cost_file, config, Nyears): costs = costs.fillna(config["fill_values"]) - annuity_factor = ( - lambda v: annuity(v["lifetime"], v["discount rate"]) + v["FOM"] / 100 - ) + def annuity_factor(v): + return annuity(v["lifetime"], v["discount rate"]) + v["FOM"] / 100 costs["fixed"] = [ annuity_factor(v) * v["investment"] * Nyears for i, v in costs.iterrows() ] @@ -3343,7 +3342,7 @@ if __name__ == "__main__": limit_type = "config" limit = get(snakemake.config["co2_budget"], investment_year) for o in opts: - if not "cb" in o: + if "cb" not in o: continue limit_type = "carbon budget" fn = "results/" + snakemake.params.RDIR + "/csvs/carbon_budget_distribution.csv" @@ -3357,7 +3356,7 @@ if __name__ == "__main__": limit = co2_cap.loc[investment_year] break for o in opts: - if not "Co2L" in o: + if "Co2L" not in o: continue limit_type = "wildcard" limit = o[o.find("Co2L") + 4 :] diff --git a/scripts/retrieve_databundle.py b/scripts/retrieve_databundle.py index 6ae09a10..cba92f18 100644 --- a/scripts/retrieve_databundle.py +++ b/scripts/retrieve_databundle.py @@ -66,7 +66,7 @@ if __name__ == "__main__": logger.info(f"Downloading databundle from '{url}'.") progress_retrieve(url, tarball_fn) - logger.info(f"Extracting databundle.") + logger.info("Extracting databundle.") tarfile.open(tarball_fn).extractall(to_fn) tarball_fn.unlink() diff --git a/scripts/retrieve_gas_infrastructure_data.py b/scripts/retrieve_gas_infrastructure_data.py index 85a9d301..82d79caf 100644 --- a/scripts/retrieve_gas_infrastructure_data.py +++ b/scripts/retrieve_gas_infrastructure_data.py @@ -34,7 +34,7 @@ if __name__ == "__main__": logger.info(f"Downloading databundle from '{url}'.") progress_retrieve(url, zip_fn) - logger.info(f"Extracting databundle.") + logger.info("Extracting databundle.") zipfile.ZipFile(zip_fn).extractall(to_fn) zip_fn.unlink() diff --git a/scripts/retrieve_sector_databundle.py b/scripts/retrieve_sector_databundle.py index 493b2c09..991271b4 100644 --- a/scripts/retrieve_sector_databundle.py +++ b/scripts/retrieve_sector_databundle.py @@ -31,7 +31,7 @@ if __name__ == "__main__": logger.info(f"Downloading databundle from '{url}'.") progress_retrieve(url, tarball_fn) - logger.info(f"Extracting databundle.") + logger.info("Extracting databundle.") tarfile.open(tarball_fn).extractall(to_fn) tarball_fn.unlink() diff --git a/scripts/solve_sector_network.py b/scripts/solve_sector_network.py index c76171c5..a3d3333a 100644 --- a/scripts/solve_sector_network.py +++ b/scripts/solve_sector_network.py @@ -99,7 +99,7 @@ def add_co2_sequestration_limit(n, limit=200): limit = limit * 1e6 for o in opts: - if not "seq" in o: + if "seq" not in o: continue limit = float(o[o.find("seq") + 3 :]) * 1e6 break