Catch ValueError on index type conversion for pandas 2 support

equinor · Dec 1, 2023 · bda8406 · bda8406
1 parent b772cc3
commit bda8406
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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: