From c8f0896c9db66e7b0d786ebbaf9544964b336d0d Mon Sep 17 00:00:00 2001 From: larsevj Date: Fri, 1 Dec 2023 10:26:05 +0100 Subject: [PATCH] Catch ValueError on index type conversion for pandas 2 support --- setup.py | 2 +- webviz_ert/data_loader/__init__.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 03cb9135..2ef0c44a 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ install_requires=[ "dash-bootstrap-components", "dash-daq", - "pandas<2", + "pandas", "requests", "webviz-config>=0.0.40", "webviz-config-equinor", diff --git a/webviz_ert/data_loader/__init__.py b/webviz_ert/data_loader/__init__.py index 4726f5f2..2c5d14ab 100644 --- a/webviz_ert/data_loader/__init__.py +++ b/webviz_ert/data_loader/__init__.py @@ -1,9 +1,10 @@ -from typing import Any, Mapping, Optional, List, MutableMapping, Tuple, Dict -from collections import defaultdict -import requests +import io import logging +from collections import defaultdict +from typing import Any, Dict, List, Mapping, MutableMapping, Optional, Tuple + import pandas as pd -import io +import requests logger = logging.getLogger() @@ -194,10 +195,9 @@ def get_ensemble_record_data( except DataLoaderException as e: logger.error(e) return pd.DataFrame() - try: df.index = df.index.astype(int) - except TypeError: + except (TypeError, ValueError): try: df.index = df.index.map(pd.Timestamp) except ValueError: