|
23 | 23 | from dask.dataframe.core import ( |
24 | 24 | _concat, |
25 | 25 | _convert_to_numeric, |
26 | | - _Frame, |
27 | 26 | _repr_data_series, |
28 | 27 | _sqrt_and_convert_to_timedelta, |
29 | 28 | check_divisions, |
|
32 | 31 | is_dataframe_like, |
33 | 32 | is_series_like, |
34 | 33 | meta_warning, |
35 | | - new_dd_object, |
36 | 34 | ) |
37 | 35 | from dask.dataframe.dispatch import is_categorical_dtype, make_meta, meta_nonempty |
38 | 36 | from dask.dataframe.multi import warn_dtype_mismatch |
@@ -1370,25 +1368,6 @@ def repartition( |
1370 | 1368 | Repartition(self, npartitions, divisions, force, partition_size, freq) |
1371 | 1369 | ) |
1372 | 1370 |
|
1373 | | - def to_legacy_dataframe(self, optimize: bool = True, **optimize_kwargs) -> _Frame: |
1374 | | - """Convert to a legacy dask-dataframe collection |
1375 | | -
|
1376 | | - Parameters |
1377 | | - ---------- |
1378 | | - optimize |
1379 | | - Whether to optimize the underlying `Expr` object before conversion. |
1380 | | - **optimize_kwargs |
1381 | | - Key-word arguments to pass through to `optimize`. |
1382 | | - """ |
1383 | | - warnings.warn( |
1384 | | - "to_legacy_dataframe is deprecated and will be removed in a future release. " |
1385 | | - "The legacy implementation as a whole is deprecated and will be removed, making " |
1386 | | - "this method unnecessary.", |
1387 | | - FutureWarning, |
1388 | | - ) |
1389 | | - df = self.optimize(**optimize_kwargs) if optimize else self |
1390 | | - return new_dd_object(df.dask, df._name, df._meta, df.divisions) |
1391 | | - |
1392 | 1371 | def to_dask_array( |
1393 | 1372 | self, lengths=None, meta=None, optimize: bool = True, **optimize_kwargs |
1394 | 1373 | ) -> Array: |
@@ -5052,28 +5031,6 @@ def from_dict( |
5052 | 5031 | ) |
5053 | 5032 |
|
5054 | 5033 |
|
5055 | | -def from_legacy_dataframe(ddf: _Frame, optimize: bool = True) -> FrameBase: |
5056 | | - """Create a dask-expr collection from a legacy dask-dataframe collection |
5057 | | -
|
5058 | | - Parameters |
5059 | | - ---------- |
5060 | | - optimize |
5061 | | - Whether to optimize the graph before conversion. |
5062 | | - """ |
5063 | | - warnings.warn( |
5064 | | - "from_legacy_dataframe is deprecated and will be removed in a future release. " |
5065 | | - "The legacy implementation as a whole is deprecated and will be removed, making " |
5066 | | - "this method unnecessary.", |
5067 | | - FutureWarning, |
5068 | | - ) |
5069 | | - graph = ddf.dask |
5070 | | - if optimize: |
5071 | | - graph = ddf.__dask_optimize__(graph, ddf.__dask_keys__()) |
5072 | | - return from_graph( |
5073 | | - graph, ddf._meta, ddf.divisions, ddf.__dask_keys__(), key_split(ddf._name) |
5074 | | - ) |
5075 | | - |
5076 | | - |
5077 | 5034 | def from_dask_array(x, columns=None, index=None, meta=None): |
5078 | 5035 | """Create a Dask DataFrame from a Dask Array. |
5079 | 5036 |
|
@@ -5809,7 +5766,7 @@ def merge_asof( |
5809 | 5766 | del kwargs["on"] |
5810 | 5767 |
|
5811 | 5768 | for o in [left_on, right_on]: |
5812 | | - if isinstance(o, _Frame): |
| 5769 | + if isinstance(o, FrameBase): |
5813 | 5770 | raise NotImplementedError( |
5814 | 5771 | "Dask collections not currently allowed in merge columns" |
5815 | 5772 | ) |
|
0 commit comments