Regression in tests caused by pandas fixed by pandas 2.1.4

OSeMOSYS · Dec 15, 2023 · dcd5a49 · dcd5a49
1 parent f9ffec2
commit dcd5a49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -47,7 +47,7 @@ install_requires =
     xlrd
     pyyaml
     pydot
-    pandas>=1.1,<2.1
+    pandas>=2.1.4
     Amply>=0.1.6
     networkx
     flatten_dict

diff --git a/src/otoole/input.py b/src/otoole/input.py
@@ -341,8 +341,11 @@ def _expand_defaults(
             df_default["VALUE"] = default_values[name]
 
             # combine result and default value dataframe
-            df = pd.concat([data, df_default])
-            df = df[~df.index.duplicated(keep="first")]
+            if not data.empty:
+                df = pd.concat([data, df_default])
+                df = df[~df.index.duplicated(keep="first")]
+            else:
+                df = df_default
             df = df.sort_index()
             output[name] = df
 

diff --git a/tests/test_input.py b/tests/test_input.py
@@ -265,7 +265,7 @@ def result_data(region):
         input_data_single_index_empty(region),
     ]
     parameter_test_data_ids = [
-        "multi_index_no_defaluts",
+        "multi_index_no_defaults",
         "multi_index",
         "multi_index_empty",
         "single_index",