Merge branch 'branch-25.04' into new-normalizer-apis

rapidsai · Feb 12, 2025 · 6d4a670 · 6d4a670
2 parents 640d8c9 + b4ff54f
commit 6d4a670
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 93 deletions.
diff --git a/python/dask_cudf/dask_cudf/_expr/__init__.py b/python/dask_cudf/dask_cudf/_expr/__init__.py
@@ -1,96 +1,79 @@
 # Copyright (c) 2024-2025, NVIDIA CORPORATION.
 
-from packaging.version import Version
-
 import dask
+import dask.dataframe.dask_expr._shuffle as _shuffle_module
+from dask.dataframe import get_collection_type
+from dask.dataframe.dask_expr import (
+    DataFrame as DXDataFrame,
+    FrameBase,
+    Index as DXIndex,
+    Series as DXSeries,
+    from_dict,
+    new_collection,
+)
+from dask.dataframe.dask_expr._cumulative import (
+    CumulativeBlockwise,
+)
+from dask.dataframe.dask_expr._expr import (
+    Elemwise,
+    Expr,
+    RenameAxis,
+    VarColumns,
+)
+from dask.dataframe.dask_expr._groupby import (
+    DecomposableGroupbyAggregation,
+    GroupBy as DXGroupBy,
+    GroupbyAggregation,
+    SeriesGroupBy as DXSeriesGroupBy,
+    SingleAggregation,
+)
+from dask.dataframe.dask_expr._reductions import (
+    Reduction,
+    Var,
+)
+from dask.dataframe.dask_expr._util import (
+    _convert_to_list,
+    _raise_if_object_series,
+    is_scalar,
+)
+from dask.dataframe.dask_expr.io.io import (
+    FusedIO,
+    FusedParquetIO,
+)
+from dask.dataframe.dask_expr.io.parquet import (
+    FragmentWrapper,
+    ReadParquetFSSpec,
+    ReadParquetPyarrowFS,
+)
 
-if Version(dask.__version__) > Version("2024.12.1"):
-    import dask.dataframe.dask_expr._shuffle as _shuffle_module
-    from dask.dataframe.dask_expr import (
-        DataFrame as DXDataFrame,
-        FrameBase,
-        Index as DXIndex,
-        Series as DXSeries,
-        from_dict,
-        get_collection_type,
-        new_collection,
-    )
-    from dask.dataframe.dask_expr._cumulative import (
-        CumulativeBlockwise,
-    )
-    from dask.dataframe.dask_expr._expr import (
-        Elemwise,
-        Expr,
-        RenameAxis,
-        VarColumns,
-    )
-    from dask.dataframe.dask_expr._groupby import (
-        DecomposableGroupbyAggregation,
-        GroupBy as DXGroupBy,
-        GroupbyAggregation,
-        SeriesGroupBy as DXSeriesGroupBy,
-        SingleAggregation,
-    )
-    from dask.dataframe.dask_expr._reductions import (
-        Reduction,
-        Var,
-    )
-    from dask.dataframe.dask_expr._util import (
-        _convert_to_list,
-        _raise_if_object_series,
-        is_scalar,
-    )
-    from dask.dataframe.dask_expr.io.io import (
-        FusedIO,
-        FusedParquetIO,
-    )
-    from dask.dataframe.dask_expr.io.parquet import (
-        FragmentWrapper,
-        ReadParquetFSSpec,
-        ReadParquetPyarrowFS,
-    )
-else:
-    import dask_expr._shuffle as _shuffle_module  # noqa: F401
-    from dask_expr import (  # noqa: F401
-        DataFrame as DXDataFrame,
-        FrameBase,
-        Index as DXIndex,
-        Series as DXSeries,
-        from_dict,
-        get_collection_type,
-        new_collection,
-    )
-    from dask_expr._cumulative import CumulativeBlockwise  # noqa: F401
-    from dask_expr._expr import (  # noqa: F401
-        Elemwise,
-        Expr,
-        RenameAxis,
-        VarColumns,
-    )
-    from dask_expr._groupby import (  # noqa: F401
-        DecomposableGroupbyAggregation,
-        GroupBy as DXGroupBy,
-        GroupbyAggregation,
-        SeriesGroupBy as DXSeriesGroupBy,
-        SingleAggregation,
-    )
-    from dask_expr._reductions import Reduction, Var  # noqa: F401
-    from dask_expr._util import (  # noqa: F401
-        _convert_to_list,
-        _raise_if_object_series,
-        is_scalar,
-    )
-    from dask_expr.io.io import FusedIO, FusedParquetIO  # noqa: F401
-    from dask_expr.io.parquet import (  # noqa: F401
-        FragmentWrapper,
-        ReadParquetFSSpec,
-        ReadParquetPyarrowFS,
-    )
-
-    from dask.dataframe import _dask_expr_enabled
-
-    if not _dask_expr_enabled():
-        raise ValueError(
-            "The legacy DataFrame API is not supported for RAPIDS >24.12. "
-            "The 'dataframe.query-planning' config must be True or None."
-        )
+__all__ = [
+    "CumulativeBlockwise",
+    "DXDataFrame",
+    "DXGroupBy",
+    "DXIndex",
+    "DXSeries",
+    "DXSeriesGroupBy",
+    "DecomposableGroupbyAggregation",
+    "Elemwise",
+    "Expr",
+    "FragmentWrapper",
+    "FrameBase",
+    "FusedIO",
+    "FusedParquetIO",
+    "GroupbyAggregation",
+    "ReadParquetFSSpec",
+    "ReadParquetPyarrowFS",
+    "Reduction",
+    "RenameAxis",
+    "SingleAggregation",
+    "Var",
+    "VarColumns",
+    "_convert_to_list",
+    "_raise_if_object_series",
+    "_shuffle_module",
+    "dask",
+    "from_dict",
+    "get_collection_type",
+    "is_scalar",
+    "new_collection",
+]
diff --git a/python/dask_cudf/dask_cudf/_expr/collection.py b/python/dask_cudf/dask_cudf/_expr/collection.py
@@ -4,6 +4,7 @@
 from functools import cached_property
 
 from dask import config
+from dask.dataframe import get_collection_type
 from dask.dataframe.core import is_dataframe_like
 from dask.dataframe.dispatch import get_parallel_type
 from dask.typing import no_default
@@ -16,7 +17,6 @@
     DXSeries,
     FrameBase,
     _raise_if_object_series,
-    get_collection_type,
     new_collection,
 )