From 041e5b1fc48eb40dac4597a98ba904843b1296ae Mon Sep 17 00:00:00 2001 From: venaturum Date: Mon, 1 Jul 2024 19:59:44 +1000 Subject: [PATCH] Fix for deprecation warnings --- src/gurobi_logtools/helpers.py | 6 +++--- tests/test_fill_defaults.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gurobi_logtools/helpers.py b/src/gurobi_logtools/helpers.py index 92d2d53..d9b31b9 100644 --- a/src/gurobi_logtools/helpers.py +++ b/src/gurobi_logtools/helpers.py @@ -26,8 +26,8 @@ def fill_default_parameters(summary): if re_parameter_column.match(column) and series.isnull().any() ] # TODO test cases where there are different versions involved - return summary.groupby("Version", group_keys=False).apply( - partial(fill_for_version, parameter_columns=parameter_columns) + return summary.groupby("Version", group_keys=False)[summary.columns].apply( + partial(fill_for_version, parameter_columns=parameter_columns), ) @@ -44,7 +44,7 @@ def fill_for_version_nosuffix(group): def fill_default_parameters_nosuffix(parameters): """Fill defaults for Version and parameter cols with no (Parameter) suffix.""" - return parameters.groupby("Version", group_keys=False).apply( + return parameters.groupby("Version", group_keys=False)[parameters.columns].apply( fill_for_version_nosuffix ) diff --git a/tests/test_fill_defaults.py b/tests/test_fill_defaults.py index 261e480..86d389e 100644 --- a/tests/test_fill_defaults.py +++ b/tests/test_fill_defaults.py @@ -1,5 +1,5 @@ import pandas as pd -from pandas.api.types import is_categorical_dtype, is_float_dtype, is_integer_dtype +from pandas.api.types import is_float_dtype, is_integer_dtype from pandas.testing import assert_frame_equal import gurobi_logtools as glt @@ -20,7 +20,7 @@ def test_parameter_values(): def test_pretty_parameters(): summary = glt.get_dataframe(["data/*.log"], prettyparams=True) presolve = summary["Presolve (Parameter)"] - assert is_categorical_dtype(presolve) + assert isinstance(presolve.dtype, pd.CategoricalDtype) assert set(presolve.unique()) == { "-1: Automatic", "1: Conservative",