From 1e9cb3063f3379af732bfb6782852ecd7ec901db Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Tue, 16 Nov 2021 09:27:25 +0100 Subject: [PATCH 1/4] Replace pandas.datetime with datetime,datetime --- src/egon/data/datasets/heat_demand_timeseries/HTS.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/egon/data/datasets/heat_demand_timeseries/HTS.py b/src/egon/data/datasets/heat_demand_timeseries/HTS.py index 10a73b3b4..89ffb5ce6 100644 --- a/src/egon/data/datasets/heat_demand_timeseries/HTS.py +++ b/src/egon/data/datasets/heat_demand_timeseries/HTS.py @@ -9,6 +9,8 @@ from egon.data import db, subprocess +from datetime import datetime + import xarray as xr from sqlalchemy import Column, String, Float, Integer, ForeignKey, ARRAY import egon.data.datasets.era5 as era @@ -30,7 +32,7 @@ class IdpProfiles: def __init__(self, df_index, **kwargs): index = pd.date_range( - pd.datetime(2011, 1, 1, 0), periods=8760, freq="H" + datetime(2011, 1, 1, 0), periods=8760, freq="H" ) self.df = pd.DataFrame(index=df_index) @@ -39,7 +41,7 @@ def __init__(self, df_index, **kwargs): def get_temperature_interval(self, how="geometric_series"): index = pd.date_range( - pd.datetime(2011, 1, 1, 0), periods=8760, freq="H" + datetime(2011, 1, 1, 0), periods=8760, freq="H" ) """Appoints the corresponding temperature interval to each temperature in the temperature vector. @@ -202,7 +204,7 @@ def temp_interval(): Hourly temperature intrerval of all 15 TRY Climate station#s temperature profile """ - index = pd.date_range(pd.datetime(2011, 1, 1, 0), periods=8760, freq="H") + index = pd.date_range(datetime(2011, 1, 1, 0), periods=8760, freq="H") temperature_interval = pd.DataFrame() temp_profile = temperature_profile_extract() @@ -235,7 +237,7 @@ def idp_pool_generator(): "household_heat_demand_profiles", "household_heat_demand_profiles.hdf5", ) - index = pd.date_range(pd.datetime(2011, 1, 1, 0), periods=8760, freq="H") + index = pd.date_range(datetime(2011, 1, 1, 0), periods=8760, freq="H") sfh = pd.read_hdf(path, key="SFH") mfh = pd.read_hdf(path, key="MFH") @@ -920,7 +922,7 @@ def h_value(): Extracted from demandlib. """ - index = pd.date_range(pd.datetime(2011, 1, 1, 0), periods=8760, freq="H") + index = pd.date_range(datetime(2011, 1, 1, 0), periods=8760, freq="H") a = 3.0469695 From 30a959b40520628d65de4ce2d4696d0b749e1e0b Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Thu, 18 Nov 2021 12:08:40 +0100 Subject: [PATCH 2/4] Update CHANGELOG --- CHANGELOG.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 541833cf8..0c4d7c3c9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -303,4 +303,5 @@ Bug fixes `#511 `_ * Add `data_bundle` to `industrial_sites` task dependencies `#468 `_ - +* Use inbuilt `datetime` package instead of `pandas.datetime` + `#516 `_ From 4379a01c2e805eee64d18e65a7fae345630fcd4c Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Fri, 19 Nov 2021 09:28:59 +0100 Subject: [PATCH 3/4] Run isort --- .../datasets/heat_demand_timeseries/HTS.py | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/egon/data/datasets/heat_demand_timeseries/HTS.py b/src/egon/data/datasets/heat_demand_timeseries/HTS.py index 89ffb5ce6..40ed82e93 100644 --- a/src/egon/data/datasets/heat_demand_timeseries/HTS.py +++ b/src/egon/data/datasets/heat_demand_timeseries/HTS.py @@ -1,30 +1,27 @@ -import pandas as pd -import numpy as np -import psycopg2 -import pandas.io.sql as sqlio +from datetime import datetime +import glob +import os + +from sqlalchemy import ARRAY, Column, Float, ForeignKey, Integer, String +from sqlalchemy.ext.declarative import declarative_base import geopandas as gpd import matplotlib.pyplot as plt -import os -import glob +import numpy as np +import pandas as pd +import pandas.io.sql as sqlio +import psycopg2 +import xarray as xr from egon.data import db, subprocess - -from datetime import datetime - -import xarray as xr -from sqlalchemy import Column, String, Float, Integer, ForeignKey, ARRAY import egon.data.datasets.era5 as era -from sqlalchemy.ext.declarative import declarative_base - try: - from disaggregator import config, data, spatial, temporal, plot + from disaggregator import config, data, plot, spatial, temporal except ImportError as e: pass from math import ceil - from egon.data.datasets import Dataset import egon From 5e00a221961ccc0ea46d1cf4e04dbb3070a08044 Mon Sep 17 00:00:00 2001 From: Francesco Witte Date: Fri, 19 Nov 2021 09:29:22 +0100 Subject: [PATCH 4/4] Bump up version --- src/egon/data/datasets/heat_demand_timeseries/HTS.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/egon/data/datasets/heat_demand_timeseries/HTS.py b/src/egon/data/datasets/heat_demand_timeseries/HTS.py index 40ed82e93..661bd3a3e 100644 --- a/src/egon/data/datasets/heat_demand_timeseries/HTS.py +++ b/src/egon/data/datasets/heat_demand_timeseries/HTS.py @@ -1695,7 +1695,7 @@ class HeatTimeSeries(Dataset): def __init__(self, dependencies): super().__init__( name="HeatTimeSeries", - version="0.0.0", + version="0.0.1", dependencies=dependencies, tasks=(demand_profile_generator), )