Fix deprecation warnings with is_categorical_dtype

docs/source/release_notes.rst

@@ -8,10 +8,11 @@ Future Release
     * Enhancements
     * Fixes
     * Changes
+        * Fix deprecation warnings with is_categorical_dtype (:pr:`2641`)
     * Documentation Changes
     * Testing Changes
-      * Update tests for compatibility with new versions of ``holidays`` (:pr:`2636`)
-      * Update ruff to 0.1.6 and use ruff linter/formatter (:pr:`2639`)
+        * Update tests for compatibility with new versions of ``holidays`` (:pr:`2636`)
+        * Update ruff to 0.1.6 and use ruff linter/formatter (:pr:`2639`)
 
     Thanks to the following people for contributing to this release:
     :user:`gsheni`, :user:`thehomebrewnerd`

featuretools/computational_backends/feature_set_calculator.py

@@ -836,7 +836,7 @@ def last_n(df):
                 #
                 # Pandas claims that bug is fixed but it still shows up in some
                 # cases.  More investigation needed.
-                if pdtypes.is_categorical_dtype(frame.index):
+                if isinstance(frame.index, pd.CategoricalDtype):
                     categories = pdtypes.CategoricalDtype(
                         categories=frame.index.categories,
                     )

featuretools/primitives/standard/transform/binary/greater_than.py

@@ -1,6 +1,5 @@
 import numpy as np
 import pandas as pd
-import pandas.api.types as pdtypes
 from woodwork.column_schema import ColumnSchema
 from woodwork.logical_types import BooleanNullable, Datetime, Ordinal
 
@@ -37,8 +36,8 @@ class GreaterThan(TransformPrimitive):
 
     def get_function(self):
         def greater_than(val1, val2):
-            val1_is_categorical = pdtypes.is_categorical_dtype(val1)
-            val2_is_categorical = pdtypes.is_categorical_dtype(val2)
+            val1_is_categorical = isinstance(val1, pd.CategoricalDtype)
+            val2_is_categorical = isinstance(val2, pd.CategoricalDtype)
             if val1_is_categorical and val2_is_categorical:
                 if not all(val1.cat.categories == val2.cat.categories):
                     return val1.where(pd.isnull, np.nan)

featuretools/primitives/standard/transform/binary/greater_than_equal_to.py

@@ -1,6 +1,5 @@
 import numpy as np
 import pandas as pd
-import pandas.api.types as pdtypes
 from woodwork.column_schema import ColumnSchema
 from woodwork.logical_types import BooleanNullable, Datetime, Ordinal
 
@@ -37,8 +36,8 @@ class GreaterThanEqualTo(TransformPrimitive):
 
     def get_function(self):
         def greater_than_equal(val1, val2):
-            val1_is_categorical = pdtypes.is_categorical_dtype(val1)
-            val2_is_categorical = pdtypes.is_categorical_dtype(val2)
+            val1_is_categorical = isinstance(val1, pd.CategoricalDtype)
+            val2_is_categorical = isinstance(val2, pd.CategoricalDtype)
             if val1_is_categorical and val2_is_categorical:
                 if not all(val1.cat.categories == val2.cat.categories):
                     return val1.where(pd.isnull, np.nan)

featuretools/primitives/standard/transform/binary/less_than.py

@@ -1,6 +1,5 @@
 import numpy as np
 import pandas as pd
-import pandas.api.types as pdtypes
 from woodwork.column_schema import ColumnSchema
 from woodwork.logical_types import BooleanNullable, Datetime, Ordinal
 
@@ -37,8 +36,8 @@ class LessThan(TransformPrimitive):
 
     def get_function(self):
         def less_than(val1, val2):
-            val1_is_categorical = pdtypes.is_categorical_dtype(val1)
-            val2_is_categorical = pdtypes.is_categorical_dtype(val2)
+            val1_is_categorical = isinstance(val1, pd.CategoricalDtype)
+            val2_is_categorical = isinstance(val2, pd.CategoricalDtype)
             if val1_is_categorical and val2_is_categorical:
                 if not all(val1.cat.categories == val2.cat.categories):
                     return val1.where(pd.isnull, np.nan)

featuretools/primitives/standard/transform/binary/less_than_equal_to.py

@@ -1,6 +1,5 @@
 import numpy as np
 import pandas as pd
-import pandas.api.types as pdtypes
 from woodwork.column_schema import ColumnSchema
 from woodwork.logical_types import BooleanNullable, Datetime, Ordinal
 
@@ -37,8 +36,8 @@ class LessThanEqualTo(TransformPrimitive):
 
     def get_function(self):
         def less_than_equal(val1, val2):
-            val1_is_categorical = pdtypes.is_categorical_dtype(val1)
-            val2_is_categorical = pdtypes.is_categorical_dtype(val2)
+            val1_is_categorical = isinstance(val1, pd.CategoricalDtype)
+            val2_is_categorical = isinstance(val2, pd.CategoricalDtype)
             if val1_is_categorical and val2_is_categorical:
                 if not all(val1.cat.categories == val2.cat.categories):
                     return val1.where(pd.isnull, np.nan)

pyproject.toml

@@ -114,7 +114,6 @@ docs = [
 ]
 dev = [
     "ruff >= 0.1.6",
-    "black[jupyter] >= 23.1.0",
     "pre-commit >= 2.20.0",
     "featuretools[docs,dask,spark,test]",
 ]