From b6f2a51c07af8be2d13798b704f8801c7a618b11 Mon Sep 17 00:00:00 2001 From: Markus Pichler Date: Tue, 16 Apr 2024 10:11:58 +0200 Subject: [PATCH] style: fixed pandas deprecation errors for frequency strings --- ehyd_tools/data_processing.py | 2 +- ehyd_tools/design_rainfall.py | 4 ++-- ehyd_tools/in_out.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ehyd_tools/data_processing.py b/ehyd_tools/data_processing.py index 3f61f86..b6f2bff 100644 --- a/ehyd_tools/data_processing.py +++ b/ehyd_tools/data_processing.py @@ -56,7 +56,7 @@ def data_validation(series): tags = DataFrame(index=ts.index) tags['nans'] = isna(ts).astype(int) - tags = tags.reindex(tags.asfreq('T').index) + tags = tags.reindex(tags.asfreq('min').index) tags['gaps'] = isna(ts.fillna(0).reindex(tags.index)).astype(int) return tags diff --git a/ehyd_tools/design_rainfall.py b/ehyd_tools/design_rainfall.py index 33a9f77..09692d2 100644 --- a/ehyd_tools/design_rainfall.py +++ b/ehyd_tools/design_rainfall.py @@ -83,7 +83,7 @@ def table(self): # df = df.dropna(axis=0, how='all') # convert string column names to integers - df.columns = df.columns.str.replace('T', '').astype(int) + df.columns = df.columns.str.replace('min', '').astype(int) # df.columns.name = 'Jährlichkeit' df.columns.name = INDICES.RETURN_PERIOD @@ -217,7 +217,7 @@ def read_ehyd_design_rainfall(filepath_or_buffer): df = df.dropna(axis=0, how='all') # convert string column names to integers - df.columns = [int(c.replace('T', '')) for c in df.columns] + df.columns = [int(c.replace('min', '')) for c in df.columns] # df.columns.name = 'Jährlichkeit' df.columns.name = INDICES.RETURN_PERIOD diff --git a/ehyd_tools/in_out.py b/ehyd_tools/in_out.py index 1e072d9..a307bd5 100644 --- a/ehyd_tools/in_out.py +++ b/ehyd_tools/in_out.py @@ -121,7 +121,7 @@ def import_series(filename, series_label='precipitation', index_label='datetime' return read_ehyd_file(filename) elif filename.endswith('parquet'): try: - return pd.read_parquet(filename).iloc[:, 0].asfreq('T').copy() + return pd.read_parquet(filename).iloc[:, 0].asfreq('min').copy() except ImportError: raise PARQUET_ERROR else: