fix int to int64 issue in read_strategies

OSeMOSYS · Oct 22, 2023 · 6066f34 · 6066f34
1 parent d06a051
commit 6066f34
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/otoole/results/results.py b/src/otoole/results/results.py
@@ -347,7 +347,7 @@ def read_model(self, file_path: Union[str, TextIO]) -> pd.DataFrame:
         df["INDEX"] = df["INDEX"].map(lambda x: x.split("]")[0])
         df = (
             df[["ID", "NUM", "NAME", "INDEX"]]
-            .astype({"ID": str, "NUM": int, "NAME": str, "INDEX": str})
+            .astype({"ID": str, "NUM": "int64", "NAME": str, "INDEX": str})
             .reset_index(drop=True)
         )
 
@@ -425,7 +425,7 @@ def read_solution(
         data = (
             data[["ID", "NUM", "STATUS", "PRIM", "DUAL"]]
             .astype(
-                {"ID": str, "NUM": int, "STATUS": str, "PRIM": float, "DUAL": float}
+                {"ID": str, "NUM": "int64", "STATUS": str, "PRIM": float, "DUAL": float}
             )
             .reset_index(drop=True)
         )

diff --git a/tests/test_read_strategies.py b/tests/test_read_strategies.py
@@ -108,7 +108,7 @@ def test_solution_to_dataframe(self, user_config):
                 ],
                 columns=["REGION", "TECHNOLOGY", "YEAR", "VALUE"],
             )
-            .astype({"REGION": str, "TECHNOLOGY": str, "YEAR": int, "VALUE": float})
+            .astype({"REGION": str, "TECHNOLOGY": str, "YEAR": "int64", "VALUE": float})
             .set_index(["REGION", "TECHNOLOGY", "YEAR"])
         )
 
@@ -135,8 +135,8 @@ def test_solution_to_dataframe(self, user_config):
                     "REGION": str,
                     "TIMESLICE": str,
                     "TECHNOLOGY": str,
-                    "MODE_OF_OPERATION": int,
-                    "YEAR": int,
+                    "MODE_OF_OPERATION": "int64",
+                    "YEAR": "int64",
                     "VALUE": float,
                 }
             )
@@ -202,7 +202,7 @@ def test_solution_to_dataframe(self, user_config):
                 ],
                 columns=["REGION", "YEAR", "VALUE"],
             )
-            .astype({"YEAR": int, "VALUE": float})
+            .astype({"YEAR": "int64", "VALUE": float})
             .set_index(["REGION", "YEAR"])
         )
 
@@ -225,7 +225,7 @@ def test_solution_to_dataframe(self, user_config):
                     "VALUE",
                 ],
             )
-            .astype({"YEAR": int, "VALUE": float, "MODE_OF_OPERATION": int})
+            .astype({"YEAR": "int64", "VALUE": float, "MODE_OF_OPERATION": "int64"})
             .set_index(
                 ["REGION", "TIMESLICE", "TECHNOLOGY", "MODE_OF_OPERATION", "YEAR"]
             )
@@ -623,7 +623,7 @@ def test_read_model(self, user_config):
                 ["j", 1028, "RateOfActivity", "SIMPLICITY,IN,BACKSTOP1,1,2014"],
             ],
             columns=["ID", "NUM", "NAME", "INDEX"],
-        )
+        ).astype({"ID": str, "NUM": "int64", "NAME": str, "INDEX": str})
 
         pd.testing.assert_frame_equal(actual, expected)
 
@@ -726,7 +726,7 @@ def test_remove_empty_lines(self, user_config):
                 ],
                 columns=["REGION", "FUEL", "YEAR", "VALUE"],
             )
-            .astype({"REGION": str, "FUEL": str, "YEAR": int, "VALUE": float})
+            .astype({"REGION": str, "FUEL": str, "YEAR": "int64", "VALUE": float})
             .set_index(["REGION", "FUEL", "YEAR"])
         }
 
@@ -757,7 +757,7 @@ def test_change_types(self, user_config):
                 ],
                 columns=["REGION", "FUEL", "YEAR", "VALUE"],
             )
-            .astype({"REGION": str, "FUEL": str, "YEAR": int, "VALUE": float})
+            .astype({"REGION": str, "FUEL": str, "YEAR": "int64", "VALUE": float})
             .set_index(["REGION", "FUEL", "YEAR"])
         }