Skip to content

Commit dcd5a49

Browse files
committed
Regression in tests caused by pandas fixed by pandas 2.1.4
1 parent f9ffec2 commit dcd5a49

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ install_requires =
4747
xlrd
4848
pyyaml
4949
pydot
50-
pandas>=1.1,<2.1
50+
pandas>=2.1.4
5151
Amply>=0.1.6
5252
networkx
5353
flatten_dict

src/otoole/input.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,11 @@ def _expand_defaults(
341341
df_default["VALUE"] = default_values[name]
342342

343343
# combine result and default value dataframe
344-
df = pd.concat([data, df_default])
345-
df = df[~df.index.duplicated(keep="first")]
344+
if not data.empty:
345+
df = pd.concat([data, df_default])
346+
df = df[~df.index.duplicated(keep="first")]
347+
else:
348+
df = df_default
346349
df = df.sort_index()
347350
output[name] = df
348351

tests/test_input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def result_data(region):
265265
input_data_single_index_empty(region),
266266
]
267267
parameter_test_data_ids = [
268-
"multi_index_no_defaluts",
268+
"multi_index_no_defaults",
269269
"multi_index",
270270
"multi_index_empty",
271271
"single_index",

0 commit comments

Comments
 (0)