Merge pull request #49 from venaturum/pandas_2_deprecation_warnings

Fix for deprecation warnings
Gurobi · Jul 8, 2024 · a715bf7 · a715bf7
2 parents 5fa8300 + 041e5b1
commit a715bf7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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",