From 086d46cdb4aa0a8943da99057d57f6068615ae4b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 08:21:07 +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 | 6 ++++-- scripts/retrieve_jrc_idees.py | 15 +++++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index a93562b2..72c2b5bd 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -1103,10 +1103,12 @@ def build_transport_data( transport_data = pd.concat([transport_data, swiss_cars]).sort_index() transport_data.rename(columns={"passenger cars": "number cars"}, inplace=True) - + # clean up dataframe years = np.arange(2000, 2022) - transport_data = transport_data[transport_data.index.get_level_values(1).isin(years)] + transport_data = transport_data[ + transport_data.index.get_level_values(1).isin(years) + ] missing = transport_data.index[transport_data["number cars"].isna()] if not missing.empty: diff --git a/scripts/retrieve_jrc_idees.py b/scripts/retrieve_jrc_idees.py index 6c61ee19..0e23b82c 100644 --- a/scripts/retrieve_jrc_idees.py +++ b/scripts/retrieve_jrc_idees.py @@ -10,19 +10,18 @@ import logging import os import zipfile from pathlib import Path -from _helpers import configure_logging, progress_retrieve, set_scenario_config +from _helpers import configure_logging, progress_retrieve, set_scenario_config 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/JRC-IDEES-2021.zip" -) +url_jrc = "https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2021_v1/JRC-IDEES-2021.zip" if __name__ == "__main__": if "snakemake" not in globals(): from _helpers import mock_snakemake + snakemake = mock_snakemake("retrieve_jrc_idees") rootpath = ".." else: @@ -36,16 +35,12 @@ if __name__ == "__main__": to_fn_zp = to_fn + ".zip" # download .zip file - logger.info( - f"Downloading JRC IDEES from {url_jrc}." - ) + logger.info(f"Downloading JRC IDEES from {url_jrc}.") progress_retrieve(url_jrc, to_fn_zp, disable=disable_progress) - + # extract logger.info("Extracting JRC IDEES data.") with zipfile.ZipFile(to_fn_zp, "r") as zip_ref: zip_ref.extractall(to_fn) logger.info(f"JRC IDEES data available in '{to_fn}'.") - - \ No newline at end of file