From 30dd3068c1dcb661f2151b9e72b6edbed0273544 Mon Sep 17 00:00:00 2001 From: FelixMau Date: Tue, 14 Nov 2023 11:37:20 +0100 Subject: [PATCH] Now even more beautiful code --- data_adapter_oemof/build_datapackage.py | 1 - data_adapter_oemof/mappings.py | 6 ++++-- tests/test_build_datapackage.py | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/data_adapter_oemof/build_datapackage.py b/data_adapter_oemof/build_datapackage.py index 20458d7..10edc82 100644 --- a/data_adapter_oemof/build_datapackage.py +++ b/data_adapter_oemof/build_datapackage.py @@ -4,7 +4,6 @@ from typing import Optional import pandas as pd -import numpy as np from data_adapter import core from data_adapter.preprocessing import Adapter from datapackage import Package diff --git a/data_adapter_oemof/mappings.py b/data_adapter_oemof/mappings.py index d870101..8e2e5df 100644 --- a/data_adapter_oemof/mappings.py +++ b/data_adapter_oemof/mappings.py @@ -115,8 +115,10 @@ def get_data(self, key, field_type: Optional[Type] = None): f"Using existing timeseries column '{timeseries_key}'." ) return timeseries_key - logger.info(f"For Process {self.process_name} no timeseries found " - f"entry for mapped key '{key}'") + logger.info( + f"For Process {self.process_name} no timeseries found " + f"entry for mapped key '{key}'" + ) return None # 2 Use defaults diff --git a/tests/test_build_datapackage.py b/tests/test_build_datapackage.py index e55ae63..21bc870 100644 --- a/tests/test_build_datapackage.py +++ b/tests/test_build_datapackage.py @@ -6,12 +6,12 @@ import pytest from data_adapter.databus import download_collection from data_adapter.preprocessing import Adapter +from oemof.tabular.datapackage import EnergySystem, Model +from oemof.tabular.facades import Bus, Commodity, Dispatchable, Load, Storage, Volatile from pandas import Timestamp from utils import PATH_TEST_FILES, check_if_csv_dirs_equal from data_adapter_oemof.build_datapackage import DataPackage, refactor_timeseries -from oemof.tabular.datapackage import EnergySystem, Model -from oemof.tabular.facades import Dispatchable, Load, Commodity, Storage, Bus, Volatile path_default = PATH_TEST_FILES / "_files" @@ -290,10 +290,12 @@ def test_read_datapackage(): "bus": Bus, "storage": Storage, "volatile": Volatile, - "commodity": Commodity + "commodity": Commodity, }, ) model = Model(es) + test_model = 1 + assert model, test_model def test_period_csv_creation():