From a6ea15ea4a811a4874209c780c5ea42958092d4c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:11:26 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_district_heat_share.py | 4 +++- scripts/build_energy_totals.py | 8 +++++--- scripts/build_transport_demand.py | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/build_district_heat_share.py b/scripts/build_district_heat_share.py index 10a30915..178f2c0d 100644 --- a/scripts/build_district_heat_share.py +++ b/scripts/build_district_heat_share.py @@ -33,7 +33,9 @@ if __name__ == "__main__": pop_layout = pd.read_csv(snakemake.input.clustered_pop_layout, index_col=0) year = str(snakemake.params.energy_totals_year) - district_heat_share = pd.read_csv(snakemake.input.district_heat_share, index_col=0)[year] + district_heat_share = pd.read_csv(snakemake.input.district_heat_share, index_col=0)[ + year + ] # make ct-based share nodal district_heat_share = district_heat_share.reindex(pop_layout.ct).fillna(0) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index 19fc5a8e..dda84a53 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -419,7 +419,7 @@ def build_energy_totals(countries, eurostat, swiss, idees): # add swiss energy data - df = pd.concat([df.drop("CH", errors='ignore'), swiss]).sort_index() + df = pd.concat([df.drop("CH", errors="ignore"), swiss]).sort_index() # get values for missing countries based on Eurostat EnergyBalances # divide cooking/space/water according to averages in EU28 @@ -724,7 +724,7 @@ def build_transport_data(countries, population, idees): countries_without_ch = set(countries) - {"CH"} new_index = pd.MultiIndex.from_product( [countries_without_ch, transport_data.index.levels[1]], - names=["country", "year"] + names=["country", "year"], ) transport_data = transport_data.reindex(index=new_index) @@ -750,7 +750,9 @@ def build_transport_data(countries, population, idees): cars_pp = transport_data["number cars"] / population - fill_values = {year: cars_pp.mean() * population for year in transport_data.index.levels[1]} + fill_values = { + year: cars_pp.mean() * population for year in transport_data.index.levels[1] + } fill_values = pd.DataFrame(fill_values).stack() fill_values = pd.DataFrame(fill_values, columns=["number cars"]) fill_values.index.names = ["country", "year"] diff --git a/scripts/build_transport_demand.py b/scripts/build_transport_demand.py index 085a0954..35f22a80 100644 --- a/scripts/build_transport_demand.py +++ b/scripts/build_transport_demand.py @@ -25,7 +25,7 @@ logger = logging.getLogger(__name__) def build_nodal_transport_data(fn, pop_layout, year): transport_data = pd.read_csv(fn, index_col=[0, 1]) - transport_data = transport_data.xs(min(2015, year), level='year') + transport_data = transport_data.xs(min(2015, year), level="year") nodal_transport_data = transport_data.loc[pop_layout.ct].fillna(0.0) nodal_transport_data.index = pop_layout.index