Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 17, 2024
1 parent e9cd429 commit a690b66
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions scripts/build_base_energy_totals.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ def calc_sector(sector):

if sector == "consumption by households":
if snakemake.config["sector"]["coal"]["shift_to_elec"]:
condition = (
(df_sector.Commodity
== "Electricity") | (df_sector.Commodity.isin(coal_fuels))
condition = (df_sector.Commodity == "Electricity") | (
df_sector.Commodity.isin(coal_fuels)
)
else:
condition = df_sector.Commodity == "Electricity"
Expand Down Expand Up @@ -167,9 +166,8 @@ def calc_sector(sector):

elif sector == "services":
if snakemake.config["sector"]["coal"]["shift_to_elec"]:
condition = (
(df_sector.Commodity
== "Electricity") | (df_sector.Commodity.isin(coal_fuels))
condition = (df_sector.Commodity == "Electricity") | (
df_sector.Commodity.isin(coal_fuels)
)
else:
condition = df_sector.Commodity == "Electricity"
Expand Down Expand Up @@ -292,9 +290,8 @@ def calc_sector(sector):
)
elif sector == "other energy":
if snakemake.config["sector"]["coal"]["shift_to_elec"]:
condition = (
(df_sector.Commodity
== "Electricity") | (df_sector.Commodity.isin(coal_fuels))
condition = (df_sector.Commodity == "Electricity") | (
df_sector.Commodity.isin(coal_fuels)
)
else:
condition = df_sector.Commodity == "Electricity"
Expand Down Expand Up @@ -322,9 +319,8 @@ def calc_sector(sector):
)
elif sector == "non energy use":
if snakemake.config["sector"]["coal"]["shift_to_elec"]:
condition = (
(df_sector.Commodity
== "Electricity") | (df_sector.Commodity.isin(coal_fuels))
condition = (df_sector.Commodity == "Electricity") | (
df_sector.Commodity.isin(coal_fuels)
)
else:
condition = df_sector.Commodity == "Electricity"
Expand Down

0 comments on commit a690b66

Please sign in to comment.