Skip to content

Commit e54bd82

Browse files
authored
Fix pandas 2.1.0 FutureWarnings (#226)
Fixes #224 and a bunch of other pandas 2.1.0 FutureWarnings.
1 parent 3e42f8e commit e54bd82

8 files changed

Lines changed: 14 additions & 4 deletions

File tree

.flake8

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
[flake8]
22

33
extend-ignore =
4+
# whitespace before ":", conflicts with black
5+
E203
46
F403
57
F405
8+
# line too long, conflicts with black in rare cases
9+
E501
610
exclude =
711
build,
812
dist,

petab/calculate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def calculate_residuals_for_table(
8383
# create residual df as copy of measurement df, change column
8484
residual_df = measurement_df.copy(deep=True).rename(
8585
columns={MEASUREMENT: RESIDUAL})
86-
86+
residual_df[RESIDUAL] = residual_df[RESIDUAL].astype("float64")
8787
# matching columns
8888
compared_cols = set(MEASUREMENT_DF_COLS)
8989
compared_cols -= {MEASUREMENT}

petab/simplify.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ def condition_parameters_to_parameter_table(problem: Problem):
7373
continue
7474

7575
series = problem.condition_df[parameter_id]
76-
value = petab.to_float_if_float(series[0])
76+
value = petab.to_float_if_float(series.iloc[0])
7777

7878
# same value for all conditions and no parametric overrides (str)?
7979
if isinstance(value, float) and len(series.unique()) == 1:
80-
replacements[parameter_id] = series[0]
80+
replacements[parameter_id] = series.iloc[0]
8181

8282
if not replacements:
8383
return

petab/visualize/data_overview.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ def get_data_per_observable(measurement_df: pd.DataFrame) -> pd.DataFrame:
5858
"""
5959

6060
my_measurements = measurement_df.copy()
61+
my_measurements[PREEQUILIBRATION_CONDITION_ID] = my_measurements[PREEQUILIBRATION_CONDITION_ID].astype("object")
62+
6163
index = [SIMULATION_CONDITION_ID]
6264
if PREEQUILIBRATION_CONDITION_ID in my_measurements:
6365
my_measurements[PREEQUILIBRATION_CONDITION_ID].fillna('', inplace=True)

petab/visualize/lint.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ def set_default(column: str, value):
124124
if column not in vis_df:
125125
vis_df[column] = value
126126
elif value is not None:
127+
if isinstance(value, str):
128+
vis_df[column] = vis_df[column].astype('object')
127129
vis_df[column].fillna(value, inplace=True)
128130

129131
set_default(C.PLOT_NAME, "")

tests/test_conditions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def test_get_parametric_overrides():
2626

2727
assert conditions.get_parametric_overrides(condition_df) == []
2828

29+
condition_df['fixedParameter1'] = condition_df['fixedParameter1'].astype("object")
2930
condition_df.loc[0, 'fixedParameter1'] = 'parameterId'
3031

3132
assert conditions.get_parametric_overrides(condition_df) == ['parameterId']

tests/test_lint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def test_check_parameter_df():
469469
LOWER_BOUND: [1e-5, 1e-6, 1e-7],
470470
UPPER_BOUND: [1e5, 1e6, 1e7]
471471
}).set_index(PARAMETER_ID)
472-
472+
parameter_df[NOMINAL_VALUE] = parameter_df[NOMINAL_VALUE].astype("object")
473473
lint.check_parameter_df(df=parameter_df)
474474

475475
# NOMINAL_VALUE empty, for non-estimated parameter

tests/test_petab.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def condition_df_2_conditions():
2424
'fixedParameter1': [1.0, 2.0]
2525
})
2626
condition_df.set_index('conditionId', inplace=True)
27+
condition_df.fixedParameter1 = condition_df.fixedParameter1.astype("object")
2728
return condition_df
2829

2930

0 commit comments

Comments
 (0)