feat(load): rebase with dev with one breaking change resolved

AntaresSimulatorTeam · Jan 30, 2025 · fc6cd91 · fc6cd91
1 parent 77c99aa
commit fc6cd91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/antarest/study/business/arrow_utils.py b/antarest/study/business/arrow_utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024, RTE (https://www.rte-france.com)
+# Copyright (c) 2025, RTE (https://www.rte-france.com)
 #
 # See AUTHORS.txt
 #

diff --git a/antarest/study/business/load_management.py b/antarest/study/business/load_management.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024, RTE (https://www.rte-france.com)
+# Copyright (c) 2025, RTE (https://www.rte-france.com)
 #
 # See AUTHORS.txt
 #
@@ -36,9 +36,8 @@ def get_load_matrix(self, study: Study, area_id: str) -> t.Tuple[pd.DataFrame, t
         if not isinstance(node, InputSeriesMatrix):
             raise TypeError(f"Expected node of type 'InputSeriesMatrix', but got '{type(node).__name__}'")
 
-        matrix_data = InputSeriesMatrix.parse(node, return_dataframe=True)
+        matrix_df = InputSeriesMatrix.parse_as_dataframe(node)
 
-        matrix_df = t.cast(pd.DataFrame, matrix_data)
         matrix_df.columns = matrix_df.columns.map(str)
 
         matrix_df.columns = pd.Index(matrix_columns)

diff --git a/tests/integration/study_data_blueprint/test_load.py b/tests/integration/study_data_blueprint/test_load.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024, RTE (https://www.rte-france.com)
+# Copyright (c) 2025, RTE (https://www.rte-france.com)
 #
 # See AUTHORS.txt
 #