From 8cc23945b5ec9cb3fa4107e14b2679ae9d5b65d5 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 13:43:38 +0000
Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 scripts/build_energy_totals.py | 19 +++++++-------
 scripts/retrieve_jrc_idees.py  | 47 +++++++++++++++++++---------------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py
index 1dbc93e6..a6eb70d1 100644
--- a/scripts/build_energy_totals.py
+++ b/scripts/build_energy_totals.py
@@ -465,7 +465,6 @@ def idees_per_country(ct: str, base_dir: str) -> pd.DataFrame:
     assert df.index[61] == "Passenger cars"
     ct_totals["passenger car efficiency"] = df.iloc[61]
 
-    
     df = pd.read_excel(fn_transport, "TrRail_ene", index_col=0)
 
     ct_totals["total rail"] = df.loc["by fuel"]
@@ -501,13 +500,12 @@ def idees_per_country(ct: str, base_dir: str) -> pd.DataFrame:
     assert df.index[6] == "International - Intra-EEAwUK"
     assert df.index[7] == "International - Extra-EEAwUK"
     ct_totals["total international aviation passenger"] = df.iloc[[6, 7]].sum()
-    
+
     # TODO freight changed from "Domestic and International - Intra-EU" -> split
     # domestic and international (intra-EU and outside EU)
     assert df.index[9] == "Domestic"
     ct_totals["total domestic aviation freight"] = df.iloc[9]
 
-
     assert df.index[10] == "International - Intra-EEAwUK"
     assert df.index[11] == "International - Extra-EEAwUK"
     ct_totals["total international aviation freight"] = df.iloc[[10, 11]].sum()
@@ -580,7 +578,7 @@ def build_idees(countries: List[str]) -> pd.DataFrame:
     # clean up dataframe
     years = np.arange(2000, 2022)
     totals = totals[totals.index.get_level_values(1).isin(years)]
-    
+
     # efficiency kgoe/100km -> ktoe/100km so that after conversion TWh/100km
     totals.loc[:, "passenger car efficiency"] /= 1e6
     # convert ktoe to TWh
@@ -679,8 +677,9 @@ def build_energy_totals(
 
         for use in uses:
             fuel_use = df[f"electricity {sector} {use}"]
-            fuel = (df[f"electricity {sector}"]
-                    .replace(0, np.nan).infer_objects(copy=False))
+            fuel = (
+                df[f"electricity {sector}"].replace(0, np.nan).infer_objects(copy=False)
+            )
             avg = fuel_use.div(fuel).mean()
             logger.debug(
                 f"{sector}: average fraction of electricity for {use} is {avg:.3f}"
@@ -811,8 +810,9 @@ def build_energy_totals(
         mean_BA = df.loc["BA"].loc[2014:2021, "total residential"].mean()
         mean_RS = df.loc["RS"].loc[2014:2021, "total residential"].mean()
         ratio = mean_BA / mean_RS
-        df.loc["BA"] = (df.loc["BA"].replace(0.0, np.nan)
-                        .infer_objects(copy=False).values)
+        df.loc["BA"] = (
+            df.loc["BA"].replace(0.0, np.nan).infer_objects(copy=False).values
+        )
         df.loc["BA"] = df.loc["BA"].combine_first(ratio * df.loc["RS"]).values
 
     return df
@@ -1394,7 +1394,8 @@ def update_residential_from_eurostat(energy: pd.DataFrame) -> pd.DataFrame:
         "Updated energy balances for residential using disaggregate final energy consumption data in Households from Eurostat"
     )
 
-#%%
+
+# %%
 if __name__ == "__main__":
     if "snakemake" not in globals():
         from _helpers import mock_snakemake
diff --git a/scripts/retrieve_jrc_idees.py b/scripts/retrieve_jrc_idees.py
index 09484311..e163a163 100644
--- a/scripts/retrieve_jrc_idees.py
+++ b/scripts/retrieve_jrc_idees.py
@@ -6,50 +6,57 @@
 Retrieve and extract JRC IDEES 2021 data.
 """
 
-import os
-import requests
-from pathlib import Path
-from bs4 import BeautifulSoup
-from _helpers import configure_logging, progress_retrieve, set_scenario_config
-import zipfile
 import logging
+import os
+import zipfile
+from pathlib import Path
 
+import requests
+from _helpers import configure_logging, progress_retrieve, set_scenario_config
+from bs4 import BeautifulSoup
 
 logger = logging.getLogger(__name__)
 
 # Define the base URL
-url_jrc = "https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2021_v1/"
-    
+url_jrc = (
+    "https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2021_v1/"
+)
+
 if __name__ == "__main__":
     if "snakemake" not in globals():
         from _helpers import mock_snakemake
+
         snakemake = mock_snakemake("retrieve_jrc_idees")
         rootpath = ".."
     else:
         rootpath = "."
-        
+
     configure_logging(snakemake)
     set_scenario_config(snakemake)
-    
+
     disable_progress = snakemake.config["run"].get("disable_progressbar", False)
-    
+
     # create a local directory to save the zip files
     local_dir = snakemake.output[0]
     if not os.path.exists(local_dir):
         os.makedirs(local_dir)
-        
+
     # get the list of zip files from the JRC URL
     response = requests.get(url_jrc)
-    soup = BeautifulSoup(response.text, 'html.parser')
-    zip_files = [link.get('href') for link in soup.find_all('a')
-                 if link.get('href').endswith('.zip')]
-    
-    logger.info(f"Downloading {len(zip_files)} .zip files for JRC IDEES from '{url_jrc}'.")
-    
+    soup = BeautifulSoup(response.text, "html.parser")
+    zip_files = [
+        link.get("href")
+        for link in soup.find_all("a")
+        if link.get("href").endswith(".zip")
+    ]
+
+    logger.info(
+        f"Downloading {len(zip_files)} .zip files for JRC IDEES from '{url_jrc}'."
+    )
+
     # download and unpack each zip file
     for zip_file in zip_files:
         logger.info(f"Downloading and unpacking {zip_file}")
         zip_url = url_jrc + zip_file
-        to_fn = local_dir+"/" + zip_file[:-4]
+        to_fn = local_dir + "/" + zip_file[:-4]
         progress_retrieve(zip_url, to_fn, disable=disable_progress)
-