From 48e290a9278b69359e4234b3fb148308f8b0e123 Mon Sep 17 00:00:00 2001 From: Bart Broere Date: Tue, 10 Oct 2023 20:37:13 +0200 Subject: [PATCH] Prepare for deprecation of is_datetime_or_timedelta_dtype in Pandas 2.0 (#592) --- eland/field_mappings.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eland/field_mappings.py b/eland/field_mappings.py index faa6585..61e45a0 100644 --- a/eland/field_mappings.py +++ b/eland/field_mappings.py @@ -36,10 +36,10 @@ import pandas as pd # type: ignore from pandas.core.dtypes.common import ( # type: ignore is_bool_dtype, is_datetime64_any_dtype, - is_datetime_or_timedelta_dtype, is_float_dtype, is_integer_dtype, is_string_dtype, + is_timedelta64_dtype, ) from pandas.core.dtypes.inference import is_list_like @@ -87,7 +87,9 @@ class Field(NamedTuple): @property def is_timestamp(self) -> bool: - return is_datetime_or_timedelta_dtype(self.pd_dtype) + return is_datetime64_any_dtype(self.pd_dtype) or is_timedelta64_dtype( + self.pd_dtype + ) @property def is_bool(self) -> bool: @@ -507,7 +509,7 @@ class FieldMappings: es_dtype = "boolean" elif is_string_dtype(pd_dtype): es_dtype = "keyword" - elif is_datetime_or_timedelta_dtype(pd_dtype): + elif is_timedelta64_dtype(pd_dtype): es_dtype = "date" elif is_datetime64_any_dtype(pd_dtype): es_dtype = "date" @@ -792,7 +794,9 @@ class FieldMappings: pd_dtypes.append(np.dtype(pd_dtype)) es_field_names.append(es_field_name) es_date_formats.append(es_date_format) - elif include_timestamp and is_datetime_or_timedelta_dtype(pd_dtype): + elif include_timestamp and ( + is_datetime64_any_dtype(pd_dtype) or is_timedelta64_dtype(pd_dtype) + ): pd_dtypes.append(np.dtype(pd_dtype)) es_field_names.append(es_field_name) es_date_formats.append(es_date_format)