fix categorical dtype isinstance checks

Author: oegedijk

explainerdashboard/explainer_methods.py

@@ -402,7 +402,7 @@ def merge_categorical_columns(
             cat_pieces.append(pd.DataFrame({col_name: merged_col}))
         else:
             if not drop_regular:
-                if isinstance(X[col_name], pd.CategoricalDtype):
+                if isinstance(X[col_name].dtype, pd.CategoricalDtype):
                     cat_pieces.append(
                         pd.DataFrame({col_name: pd.Categorical(X[col_name])})
                     )

tests/test_catboost_regression.py

@@ -95,7 +95,8 @@ def test_get_col(precalculated_catboost_regression_explainer):
         precalculated_catboost_regression_explainer.get_col("Sex"), pd.Series
     )
     assert isinstance(
-        precalculated_catboost_regression_explainer.get_col("Sex"), pd.CategoricalDtype
+        precalculated_catboost_regression_explainer.get_col("Sex").dtype,
+        pd.CategoricalDtype,
     )
 
     assert isinstance(

tests/test_classifier_base.py

@@ -127,12 +127,13 @@ def test_get_col(precalculated_rf_classifier_explainer):
         precalculated_rf_classifier_explainer.get_col("Gender"), pd.Series
     )
     assert isinstance(
-        precalculated_rf_classifier_explainer.get_col("Gender"), pd.CategoricalDtype
+        precalculated_rf_classifier_explainer.get_col("Gender").dtype,
+        pd.CategoricalDtype,
     )
 
     assert isinstance(precalculated_rf_classifier_explainer.get_col("Deck"), pd.Series)
     assert isinstance(
-        precalculated_rf_classifier_explainer.get_col("Deck"), pd.CategoricalDtype
+        precalculated_rf_classifier_explainer.get_col("Deck").dtype, pd.CategoricalDtype
     )
 
     assert isinstance(precalculated_rf_classifier_explainer.get_col("Age"), pd.Series)

tests/test_regression_base.py

@@ -76,7 +76,8 @@ def test_get_col(precalculated_rf_regression_explainer):
         precalculated_rf_regression_explainer.get_col("Gender"), pd.Series
     )
     assert isinstance(
-        precalculated_rf_regression_explainer.get_col("Gender"), pd.CategoricalDtype
+        precalculated_rf_regression_explainer.get_col("Gender").dtype,
+        pd.CategoricalDtype,
     )
 
     assert isinstance(precalculated_rf_regression_explainer.get_col("Age"), pd.Series)