fix: remove Category inheritance from ArrowDictionary

Signed-off-by: Daren Liang <[email protected]>
unionai-oss · Nov 14, 2024 · c8a1031 · c8a1031
2 parents 734c4f5 + 4bdd868
commit c8a1031
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/pandera/engines/pandas_engine.py b/pandera/engines/pandas_engine.py
@@ -1661,11 +1661,7 @@ def from_parametrized_dtype(cls, pyarrow_dtype: pyarrow.TimestampType):
         equivalents=[pyarrow.dictionary, pyarrow.DictionaryType]
     )
     @immutable(init=True)
-<<<<<<< HEAD
-    class ArrowDictionary(ArrowDataType, dtypes.Category):
-=======
-    class ArrowDictionary(DataType):
->>>>>>> 4bdd868 (fix: remove Category inheritance from ArrowDictionary)
+    class ArrowDictionary(ArrowDataType):
         """Semantic representation of a :class:`pyarrow.dictionary`."""
 
         type: Optional[pd.ArrowDtype] = dataclasses.field(