diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index b0727b17..d45742dd 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -12,7 +12,11 @@ import numpy as np import pandas as pd import pypsa import xarray as xr -from _helpers import update_config_with_sector_opts, configure_logging, set_scenario_config +from _helpers import ( + configure_logging, + set_scenario_config, + update_config_with_sector_opts, +) from add_existing_baseyear import add_build_year_to_new_assets from pypsa.clustering.spatial import normed_or_uniform diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 25e35edd..780460a2 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -15,7 +15,11 @@ import numpy as np import pandas as pd import pypsa import xarray as xr -from _helpers import update_config_with_sector_opts, set_scenario_config, configure_logging +from _helpers import ( + configure_logging, + set_scenario_config, + update_config_with_sector_opts, +) from add_electricity import sanitize_carriers from prepare_sector_network import cluster_heat_buses, define_spatial, prepare_costs diff --git a/scripts/build_ammonia_production.py b/scripts/build_ammonia_production.py index 47907cc9..a9cd907a 100644 --- a/scripts/build_ammonia_production.py +++ b/scripts/build_ammonia_production.py @@ -8,7 +8,6 @@ Build historical annual ammonia production per country in ktonNH3/a. import country_converter as coco import pandas as pd - from _helpers import set_scenario_config cc = coco.CountryConverter() diff --git a/scripts/build_biomass_potentials.py b/scripts/build_biomass_potentials.py index 2fe6922c..6291b03e 100644 --- a/scripts/build_biomass_potentials.py +++ b/scripts/build_biomass_potentials.py @@ -222,7 +222,7 @@ if __name__ == "__main__": clusters="5", planning_horizons=2050, ) - + configure_logging(snakemake) set_scenario_config(snakemake) diff --git a/scripts/build_clustered_population_layouts.py b/scripts/build_clustered_population_layouts.py index 4217baff..c923abf9 100644 --- a/scripts/build_clustered_population_layouts.py +++ b/scripts/build_clustered_population_layouts.py @@ -11,7 +11,6 @@ import atlite import geopandas as gpd import pandas as pd import xarray as xr - from _helpers import set_scenario_config if __name__ == "__main__": diff --git a/scripts/build_cop_profiles.py b/scripts/build_cop_profiles.py index ee68dd0a..54eac3a3 100644 --- a/scripts/build_cop_profiles.py +++ b/scripts/build_cop_profiles.py @@ -14,7 +14,6 @@ https://doi.org/10.1039/C2EE22653G. """ import xarray as xr - from _helpers import set_scenario_config diff --git a/scripts/build_daily_heat_demand.py b/scripts/build_daily_heat_demand.py index 03ba8c2e..4f1a3303 100644 --- a/scripts/build_daily_heat_demand.py +++ b/scripts/build_daily_heat_demand.py @@ -11,8 +11,8 @@ import geopandas as gpd import numpy as np import pandas as pd import xarray as xr -from dask.distributed import Client, LocalCluster from _helpers import set_scenario_config +from dask.distributed import Client, LocalCluster if __name__ == "__main__": if "snakemake" not in globals(): diff --git a/scripts/build_district_heat_share.py b/scripts/build_district_heat_share.py index 121e4663..46ada2f6 100644 --- a/scripts/build_district_heat_share.py +++ b/scripts/build_district_heat_share.py @@ -9,8 +9,8 @@ Build district heat shares at each node, depending on investment year. import logging import pandas as pd -from prepare_sector_network import get from _helpers import configure_logging, set_scenario_config +from prepare_sector_network import get logger = logging.getLogger(__name__) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index f22ddc25..2b4ebd19 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -14,7 +14,7 @@ import country_converter as coco import geopandas as gpd import numpy as np import pandas as pd -from _helpers import mute_print, configure_logging, set_scenario_config +from _helpers import configure_logging, mute_print, set_scenario_config from tqdm import tqdm cc = coco.CountryConverter() diff --git a/scripts/build_gas_input_locations.py b/scripts/build_gas_input_locations.py index 5aba46e5..b0aadce8 100644 --- a/scripts/build_gas_input_locations.py +++ b/scripts/build_gas_input_locations.py @@ -11,8 +11,8 @@ import logging import geopandas as gpd import pandas as pd -from cluster_gas_network import load_bus_regions from _helpers import configure_logging, set_scenario_config +from cluster_gas_network import load_bus_regions logger = logging.getLogger(__name__) diff --git a/scripts/build_gas_network.py b/scripts/build_gas_network.py index 0febd43d..52235cd1 100644 --- a/scripts/build_gas_network.py +++ b/scripts/build_gas_network.py @@ -11,9 +11,9 @@ import logging import geopandas as gpd import pandas as pd +from _helpers import configure_logging, set_scenario_config from pypsa.geo import haversine_pts from shapely.geometry import Point -from _helpers import configure_logging, set_scenario_config logger = logging.getLogger(__name__) diff --git a/scripts/build_industrial_distribution_key.py b/scripts/build_industrial_distribution_key.py index 29b7538e..90687b33 100644 --- a/scripts/build_industrial_distribution_key.py +++ b/scripts/build_industrial_distribution_key.py @@ -13,7 +13,6 @@ from itertools import product import country_converter as coco import geopandas as gpd import pandas as pd - from _helpers import configure_logging, set_scenario_config logger = logging.getLogger(__name__) diff --git a/scripts/build_industrial_energy_demand_per_country_today.py b/scripts/build_industrial_energy_demand_per_country_today.py index 99342b9e..1ccae6c2 100644 --- a/scripts/build_industrial_energy_demand_per_country_today.py +++ b/scripts/build_industrial_energy_demand_per_country_today.py @@ -11,8 +11,8 @@ from functools import partial import country_converter as coco import pandas as pd -from tqdm import tqdm from _helpers import set_scenario_config +from tqdm import tqdm cc = coco.CountryConverter() diff --git a/scripts/build_industrial_energy_demand_per_node.py b/scripts/build_industrial_energy_demand_per_node.py index fcc0abd9..42df4250 100644 --- a/scripts/build_industrial_energy_demand_per_node.py +++ b/scripts/build_industrial_energy_demand_per_node.py @@ -7,7 +7,6 @@ Build industrial energy demand per model region. """ import pandas as pd - from _helpers import set_scenario_config if __name__ == "__main__": diff --git a/scripts/build_industrial_energy_demand_per_node_today.py b/scripts/build_industrial_energy_demand_per_node_today.py index 1b7aba83..ce8d971f 100644 --- a/scripts/build_industrial_energy_demand_per_node_today.py +++ b/scripts/build_industrial_energy_demand_per_node_today.py @@ -10,7 +10,6 @@ from itertools import product import numpy as np import pandas as pd - from _helpers import set_scenario_config # map JRC/our sectors to hotmaps sector, where mapping exist diff --git a/scripts/build_industrial_production_per_country.py b/scripts/build_industrial_production_per_country.py index d9ec9afd..44cb0752 100644 --- a/scripts/build_industrial_production_per_country.py +++ b/scripts/build_industrial_production_per_country.py @@ -13,7 +13,7 @@ from functools import partial import country_converter as coco import numpy as np import pandas as pd -from _helpers import mute_print, set_scenario_config, configure_logging +from _helpers import configure_logging, mute_print, set_scenario_config from tqdm import tqdm logger = logging.getLogger(__name__) diff --git a/scripts/build_industrial_production_per_country_tomorrow.py b/scripts/build_industrial_production_per_country_tomorrow.py index 835a2687..67557b17 100644 --- a/scripts/build_industrial_production_per_country_tomorrow.py +++ b/scripts/build_industrial_production_per_country_tomorrow.py @@ -7,9 +7,8 @@ Build future industrial production per country. """ import pandas as pd -from prepare_sector_network import get - from _helpers import set_scenario_config +from prepare_sector_network import get if __name__ == "__main__": if "snakemake" not in globals(): diff --git a/scripts/build_industrial_production_per_node.py b/scripts/build_industrial_production_per_node.py index c84590b7..7e074967 100644 --- a/scripts/build_industrial_production_per_node.py +++ b/scripts/build_industrial_production_per_node.py @@ -7,9 +7,9 @@ Build industrial production per model region. """ from itertools import product -from _helpers import set_scenario_config import pandas as pd +from _helpers import set_scenario_config # map JRC/our sectors to hotmaps sector, where mapping exist sector_mapping = { diff --git a/scripts/build_population_layouts.py b/scripts/build_population_layouts.py index db548140..bab2e9a4 100644 --- a/scripts/build_population_layouts.py +++ b/scripts/build_population_layouts.py @@ -13,7 +13,6 @@ import geopandas as gpd import numpy as np import pandas as pd import xarray as xr - from _helpers import configure_logging, set_scenario_config logger = logging.getLogger(__name__) diff --git a/scripts/build_population_weighted_energy_totals.py b/scripts/build_population_weighted_energy_totals.py index 6ed32086..60d66e56 100644 --- a/scripts/build_population_weighted_energy_totals.py +++ b/scripts/build_population_weighted_energy_totals.py @@ -7,7 +7,6 @@ Distribute country-level energy demands by population. """ import pandas as pd - from _helpers import set_scenario_config if __name__ == "__main__": diff --git a/scripts/build_sequestration_potentials.py b/scripts/build_sequestration_potentials.py index 9e7678bb..ac1f22e2 100644 --- a/scripts/build_sequestration_potentials.py +++ b/scripts/build_sequestration_potentials.py @@ -10,7 +10,6 @@ database_en>`_. import geopandas as gpd import pandas as pd - from _helpers import set_scenario_config diff --git a/scripts/build_solar_thermal_profiles.py b/scripts/build_solar_thermal_profiles.py index 12826420..eb4c6f8f 100644 --- a/scripts/build_solar_thermal_profiles.py +++ b/scripts/build_solar_thermal_profiles.py @@ -11,9 +11,8 @@ import geopandas as gpd import numpy as np import pandas as pd import xarray as xr -from dask.distributed import Client, LocalCluster - from _helpers import set_scenario_config +from dask.distributed import Client, LocalCluster if __name__ == "__main__": if "snakemake" not in globals(): diff --git a/scripts/build_temperature_profiles.py b/scripts/build_temperature_profiles.py index 878ebc03..eb005d3d 100644 --- a/scripts/build_temperature_profiles.py +++ b/scripts/build_temperature_profiles.py @@ -11,8 +11,8 @@ import geopandas as gpd import numpy as np import pandas as pd import xarray as xr -from dask.distributed import Client, LocalCluster from _helpers import set_scenario_config +from dask.distributed import Client, LocalCluster if __name__ == "__main__": if "snakemake" not in globals(): diff --git a/scripts/cluster_gas_network.py b/scripts/cluster_gas_network.py index 567f4458..1292cdc3 100755 --- a/scripts/cluster_gas_network.py +++ b/scripts/cluster_gas_network.py @@ -10,9 +10,9 @@ import logging import geopandas as gpd import pandas as pd +from _helpers import configure_logging, set_scenario_config from pypsa.geo import haversine_pts from shapely import wkt -from _helpers import set_scenario_config, configure_logging logger = logging.getLogger(__name__) diff --git a/scripts/make_summary.py b/scripts/make_summary.py index 82ce2328..2dac717a 100644 --- a/scripts/make_summary.py +++ b/scripts/make_summary.py @@ -13,8 +13,8 @@ import sys import numpy as np import pandas as pd import pypsa +from _helpers import configure_logging, set_scenario_config from prepare_sector_network import prepare_costs -from _helpers import set_scenario_config, configure_logging idx = pd.IndexSlice logger = logging.getLogger(__name__) diff --git a/scripts/make_summary_perfect.py b/scripts/make_summary_perfect.py index 7c2e8d30..4a0b1556 100644 --- a/scripts/make_summary_perfect.py +++ b/scripts/make_summary_perfect.py @@ -12,6 +12,7 @@ other metrics. import numpy as np import pandas as pd import pypsa +from _helpers import set_scenario_config from make_summary import calculate_cfs # noqa: F401 from make_summary import calculate_nodal_cfs # noqa: F401 from make_summary import calculate_nodal_costs # noqa: F401 @@ -19,7 +20,6 @@ from make_summary import assign_carriers, assign_locations from prepare_sector_network import prepare_costs from pypsa.descriptors import get_active_assets from six import iteritems -from _helpers import set_scenario_config idx = pd.IndexSlice diff --git a/scripts/plot_power_network_clustered.py b/scripts/plot_power_network_clustered.py index 43746039..0c3dc635 100644 --- a/scripts/plot_power_network_clustered.py +++ b/scripts/plot_power_network_clustered.py @@ -9,10 +9,10 @@ Plot clustered electricity transmission network. import geopandas as gpd import matplotlib.pyplot as plt import pypsa +from _helpers import set_scenario_config from matplotlib.lines import Line2D from plot_power_network import load_projection from pypsa.plot import add_legend_lines -from _helpers import set_scenario_config if __name__ == "__main__": if "snakemake" not in globals(): diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py index da077348..addb87ef 100644 --- a/scripts/plot_summary.py +++ b/scripts/plot_summary.py @@ -11,8 +11,8 @@ import logging import matplotlib.gridspec as gridspec import matplotlib.pyplot as plt import pandas as pd -from prepare_sector_network import co2_emissions_year from _helpers import configure_logging, set_scenario_config +from prepare_sector_network import co2_emissions_year logger = logging.getLogger(__name__) plt.style.use("ggplot") diff --git a/scripts/prepare_perfect_foresight.py b/scripts/prepare_perfect_foresight.py index de9932fd..97e5eeeb 100644 --- a/scripts/prepare_perfect_foresight.py +++ b/scripts/prepare_perfect_foresight.py @@ -12,7 +12,11 @@ import re import numpy as np import pandas as pd import pypsa -from _helpers import update_config_with_sector_opts, set_scenario_config, configure_logging +from _helpers import ( + configure_logging, + set_scenario_config, + update_config_with_sector_opts, +) from add_existing_baseyear import add_build_year_to_new_assets from pypsa.descriptors import expand_series from pypsa.io import import_components_from_dataframe diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index bf9ed58f..90df5c93 100755 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -18,7 +18,11 @@ import numpy as np import pandas as pd import pypsa import xarray as xr -from _helpers import configure_logging, set_scenario_config, update_config_with_sector_opts +from _helpers import ( + configure_logging, + set_scenario_config, + update_config_with_sector_opts, +) from add_electricity import calculate_annuity, sanitize_carriers, sanitize_locations from build_energy_totals import build_co2_totals, build_eea_co2, build_eurostat_co2 from networkx.algorithms import complement diff --git a/scripts/retrieve_databundle.py b/scripts/retrieve_databundle.py index b6a4d378..1d217a43 100644 --- a/scripts/retrieve_databundle.py +++ b/scripts/retrieve_databundle.py @@ -36,7 +36,12 @@ import logging import tarfile from pathlib import Path -from _helpers import configure_logging, progress_retrieve, validate_checksum, set_scenario_config +from _helpers import ( + configure_logging, + progress_retrieve, + set_scenario_config, + validate_checksum, +) logger = logging.getLogger(__name__) diff --git a/scripts/retrieve_gas_infrastructure_data.py b/scripts/retrieve_gas_infrastructure_data.py index 7cc1c270..64bd6dc2 100644 --- a/scripts/retrieve_gas_infrastructure_data.py +++ b/scripts/retrieve_gas_infrastructure_data.py @@ -11,7 +11,12 @@ import logging import zipfile from pathlib import Path -from _helpers import progress_retrieve, validate_checksum, set_scenario_config, configure_logging +from _helpers import ( + configure_logging, + progress_retrieve, + set_scenario_config, + validate_checksum, +) logger = logging.getLogger(__name__)