Unpin xarray

Set dimensions order on conversion to dataframe.
equinor · May 21, 2024 · 398bae8 · 398bae8
1 parent 9ecf5d2
commit 398bae8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -81,7 +81,7 @@ dependencies=[
     "tqdm>=4.62.0",
     "uvicorn >= 0.17.0",
     "websockets",
-    "xarray<2024.5.0",
+    "xarray",
     "xtgeo >= 3.3.0",
 ]
 

diff --git a/src/ert/storage/local_ensemble.py b/src/ert/storage/local_ensemble.py
@@ -553,7 +553,7 @@ def _load_dataset(
             ]
         else:
             datasets = [self._load_single_dataset(group, i) for i in realizations]
-        return xr.combine_nested(datasets, "realizations")
+        return xr.combine_nested(datasets, concat_dim="realizations")
 
     def load_parameters(
         self, group: str, realizations: Union[int, npt.NDArray[np.int_], None] = None
@@ -637,7 +637,9 @@ def load_all_summary_data(
         summary_keys = self.get_summary_keyset()
 
         try:
-            df = self.load_responses("summary", tuple(realizations)).to_dataframe()
+            df = self.load_responses("summary", tuple(realizations)).to_dataframe(
+                dim_order=["time", "name", "realization"]
+            )
         except (ValueError, KeyError):
             return pd.DataFrame()
 

diff --git a/tests/integration_tests/test_storage_migration.py b/tests/integration_tests/test_storage_migration.py
@@ -138,7 +138,9 @@ def test_that_storage_matches(
             tuple(ensemble.get_realization_list_with_responses("summary")),
         )
         snapshot.assert_match(
-            summary_data.to_dataframe().transform(np.sort).to_csv(),
+            summary_data.to_dataframe(dim_order=["time", "name", "realization"])
+            .transform(np.sort)
+            .to_csv(),
             "summary_data",
         )
         snapshot.assert_match_dir(