NominalDtypeEnum -> NominalDtype

Author: honno

tests/strategies.py

@@ -6,10 +6,10 @@
 from hypothesis import strategies as st
 from hypothesis.extra import numpy as nps
 
-__all__ = ["mock_dataframes", "MockDataFrame", "MockColumn", "NominalDtypeEnum"]
+__all__ = ["mock_dataframes", "MockDataFrame", "MockColumn", "NominalDtype"]
 
 
-class NominalDtypeEnum(Enum):
+class NominalDtype(Enum):
     BOOL = "bool"
     UTF8 = "U8"
     DATETIME64NS = "datetime64[ns]"
@@ -29,7 +29,7 @@ class NominalDtypeEnum(Enum):
 
 class MockColumn(NamedTuple):
     array: np.ndarray
-    nominal_dtype: NominalDtypeEnum
+    nominal_dtype: NominalDtype
 
 
 class MockDataFrame(Mapping):
@@ -73,7 +73,7 @@ def __repr__(self) -> str:
 def mock_dataframes(
     draw,
     *,
-    exclude_dtypes: Collection[NominalDtypeEnum] = [],
+    exclude_dtypes: Collection[NominalDtype] = [],
     allow_zero_cols: bool = True,
     allow_zero_rows: bool = True,
 ) -> MockDataFrame:
@@ -85,10 +85,10 @@ def mock_dataframes(
     min_nrows = 0 if allow_zero_rows else 1
     nrows = draw(st.integers(min_nrows, 5))
     name_to_column = {}
-    valid_dtypes = [e for e in NominalDtypeEnum if e not in exclude_dtypes]
+    valid_dtypes = [e for e in NominalDtype if e not in exclude_dtypes]
     for colname in colnames:
         nominal_dtype = draw(st.sampled_from(valid_dtypes))
-        if nominal_dtype == NominalDtypeEnum.CATEGORY:
+        if nominal_dtype == NominalDtype.CATEGORY:
             x_strat = nps.arrays(
                 dtype=np.int8, shape=nrows, elements=st.integers(0, 15)
             )

tests/test_dataframe_object.py

@@ -5,7 +5,7 @@
 from hypothesis import assume, given
 from hypothesis import strategies as st
 
-from .strategies import MockColumn, MockDataFrame, NominalDtypeEnum, mock_dataframes
+from .strategies import MockColumn, MockDataFrame, NominalDtype, mock_dataframes
 from .wrappers import LibraryInfo
 
 
@@ -23,7 +23,7 @@ def test_library_supports_zero_rows(libinfo: LibraryInfo):
     if not libinfo.allow_zero_rows:
         pytest.xfail("library doesn't support zero rows")
     mock_df = MockDataFrame(
-        {"foo_col": MockColumn(np.asarray([], dtype=np.int64), NominalDtypeEnum.INT64)}
+        {"foo_col": MockColumn(np.asarray([], dtype=np.int64), NominalDtype.INT64)}
     )
     df = libinfo.mock_to_toplevel(mock_df)
     # See above comment

tests/wrappers.py

@@ -7,7 +7,7 @@
 from hypothesis import strategies as st
 
 from .api import DataFrame
-from .strategies import MockDataFrame, NominalDtypeEnum, mock_dataframes
+from .strategies import MockDataFrame, NominalDtype, mock_dataframes
 
 __all__ = ["libname_to_libinfo", "libinfo_params", "LibraryInfo"]
 
@@ -22,7 +22,7 @@ class LibraryInfo(NamedTuple):
     toplevel_to_compliant: Callable[[TopLevelDataFrame], DataFrame] = lambda df: (
         df.__dataframe__()["dataframe"]
     )
-    exclude_dtypes: List[NominalDtypeEnum] = []
+    exclude_dtypes: List[NominalDtype] = []
     allow_zero_cols: bool = True
     allow_zero_rows: bool = True
 
@@ -68,7 +68,7 @@ def pandas_mock_to_toplevel(mock_df: MockDataFrame) -> pd.DataFrame:
             return pd.DataFrame()
         serieses = []
         for name, (array, nominal_dtype) in mock_df.items():
-            if nominal_dtype == NominalDtypeEnum.UTF8:
+            if nominal_dtype == NominalDtype.UTF8:
                 dtype = pd.StringDtype()
             else:
                 dtype = nominal_dtype.value
@@ -83,7 +83,7 @@ def pandas_mock_to_toplevel(mock_df: MockDataFrame) -> pd.DataFrame:
         from_dataframe=pandas_from_dataframe,
         frame_equal=lambda df1, df2: df1.equals(df2),
         toplevel_to_compliant=lambda df: df.__dataframe__(),
-        exclude_dtypes=[NominalDtypeEnum.DATETIME64NS],
+        exclude_dtypes=[NominalDtype.DATETIME64NS],
     )
     libinfo_params.append(pytest.param(pandas_libinfo, id=pandas_libinfo.name))
 
@@ -106,7 +106,7 @@ def vaex_mock_to_toplevel(mock_df: MockDataFrame) -> TopLevelDataFrame:
             items.append((name, array))
         df = vaex.from_items(*items)
         for name, (array, nominal_dtype) in mock_df.items():
-            if nominal_dtype == NominalDtypeEnum.CATEGORY:
+            if nominal_dtype == NominalDtype.CATEGORY:
                 if not np.issubdtype(array.dtype, np.integer):
                     raise ValueError(
                         f"Array with dtype {array.dtype} was given, "
@@ -141,7 +141,7 @@ def vaex_frame_equal(df1, df2) -> bool:
         from_dataframe=vaex_from_dataframe,
         frame_equal=vaex_frame_equal,
         toplevel_to_compliant=lambda df: df.__dataframe__(),
-        exclude_dtypes=[NominalDtypeEnum.DATETIME64NS],
+        exclude_dtypes=[NominalDtype.DATETIME64NS],
         # https://github.com/vaexio/vaex/issues/2094
         allow_zero_cols=False,
         allow_zero_rows=False,
@@ -188,7 +188,7 @@ def modin_mock_to_toplevel(mock_df: MockDataFrame) -> mpd.DataFrame:
             raise ValueError(f"{mock_df=} not supported by modin")
         serieses: List[mpd.Series] = []
         for name, (array, nominal_dtype) in mock_df.items():
-            if nominal_dtype == NominalDtypeEnum.UTF8:
+            if nominal_dtype == NominalDtype.UTF8:
                 dtype = mpd.StringDtype()
             else:
                 dtype = nominal_dtype.value
@@ -224,9 +224,9 @@ def modin_frame_equal(df1: mpd.DataFrame, df2: mpd.DataFrame) -> bool:
         # https://github.com/modin-project/modin/issues/4654
         # https://github.com/modin-project/modin/issues/4652
         exclude_dtypes=[
-            NominalDtypeEnum.UTF8,
-            NominalDtypeEnum.DATETIME64NS,
-            NominalDtypeEnum.CATEGORY,
+            NominalDtype.UTF8,
+            NominalDtype.DATETIME64NS,
+            NominalDtype.CATEGORY,
         ],
         # https://github.com/modin-project/modin/issues/4643
         allow_zero_rows=False,
@@ -273,7 +273,7 @@ def cudf_mock_to_toplevel(mock_df: MockDataFrame) -> cudf.DataFrame:
             return cudf.DataFrame()
         serieses = []
         for name, (array, nominal_dtype) in mock_df.items():
-            if NominalDtypeEnum.CATEGORY:
+            if NominalDtype.CATEGORY:
                 # See https://github.com/rapidsai/cudf/issues/11256
                 data = array.tolist()
             else: