Skip to content

Commit fc64fec

Browse files
committed
Remove legacy DataFrame implementation
1 parent 922888e commit fc64fec

File tree

8 files changed

+14
-668
lines changed

8 files changed

+14
-668
lines changed

.github/workflows/tests.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ jobs:
5757
label: no_queue
5858
partition: "not ci1"
5959

60-
# Set dataframe.query-planning: false
61-
- os: ubuntu-latest
62-
environment: "3.10"
63-
label: no_expr
64-
partition: "ci1"
65-
- os: ubuntu-latest
66-
environment: "3.10"
67-
label: no_expr
68-
partition: "not ci1"
69-
7060
# dask.array P2P shuffle
7161
- os: ubuntu-latest
7262
environment: mindeps
@@ -221,11 +211,6 @@ jobs:
221211
if: ${{ matrix.label == 'no_queue' }}
222212
run: echo "DASK_DISTRIBUTED__SCHEDULER__WORKER_SATURATION=inf" >> $GITHUB_ENV
223213

224-
- name: Set up dask env to disable dask-expr
225-
shell: bash -l {0}
226-
if: ${{ matrix.label == 'no_expr' }}
227-
run: echo "DASK_DATAFRAME__QUERY_PLANNING=False" >> $GITHUB_ENV
228-
229214
- name: Print host info
230215
# host_info.py imports numpy, which isn't a direct dependency of distributed
231216
if: matrix.environment != 'mindeps'

continuous_integration/environment-3.10.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ dependencies:
5555
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
5656
- httpx<0.28.0
5757
- pip:
58-
- git+https://github.com/dask/dask
59-
- git+https://github.com/dask/dask-expr
58+
- git+https://github.com/phofl/dask@remove-legacy-implementation
59+
- git+https://github.com/phofl/dask-expr@legacy-conversion
6060
- git+https://github.com/dask/zict
6161
- git+https://github.com/dask/crick # Only tested here
6262
# Revert after https://github.com/dask/distributed/issues/8614 is fixed

continuous_integration/environment-3.11.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ dependencies:
4949
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
5050
- httpx<0.28.0
5151
- pip:
52-
- git+https://github.com/dask/dask
53-
- git+https://github.com/dask/dask-expr
52+
- git+https://github.com/phofl/dask@remove-legacy-implementation
53+
- git+https://github.com/phofl/dask-expr@legacy-conversion
5454
- git+https://github.com/dask/zict
5555
# Revert after https://github.com/dask/distributed/issues/8614 is fixed
5656
# - git+https://github.com/dask/s3fs

continuous_integration/environment-3.12.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ dependencies:
4949
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
5050
- httpx<0.28.0
5151
- pip:
52-
- git+https://github.com/dask/dask
53-
- git+https://github.com/dask/dask-expr
52+
- git+https://github.com/phofl/dask@remove-legacy-implementation
53+
- git+https://github.com/phofl/dask-expr@legacy-conversion
5454
- git+https://github.com/dask/zict
5555
# Revert after https://github.com/dask/distributed/issues/8614 is fixed
5656
# - git+https://github.com/dask/s3fs

continuous_integration/environment-3.13.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ dependencies:
4848
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
4949
- httpx<0.28.0
5050
- pip:
51-
- git+https://github.com/dask/dask
52-
- git+https://github.com/dask/dask-expr
51+
- git+https://github.com/phofl/dask@remove-legacy-implementation
52+
- git+https://github.com/phofl/dask-expr@legacy-conversion
5353
- git+https://github.com/dask/zict
5454
# Revert after https://github.com/dask/distributed/issues/8614 is fixed
5555
# - git+https://github.com/dask/s3fs

distributed/shuffle/__init__.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
from __future__ import annotations
22

33
from distributed.shuffle._arrow import check_minimal_arrow_version
4-
from distributed.shuffle._merge import HashJoinP2PLayer, hash_join_p2p
54
from distributed.shuffle._rechunk import rechunk_p2p
65
from distributed.shuffle._scheduler_plugin import ShuffleSchedulerPlugin
7-
from distributed.shuffle._shuffle import P2PShuffleLayer, rearrange_by_column_p2p
86
from distributed.shuffle._worker_plugin import ShuffleWorkerPlugin
97

108
__all__ = [
119
"check_minimal_arrow_version",
12-
"hash_join_p2p",
13-
"HashJoinP2PLayer",
14-
"P2PShuffleLayer",
15-
"rearrange_by_column_p2p",
1610
"rechunk_p2p",
1711
"ShuffleSchedulerPlugin",
1812
"ShuffleWorkerPlugin",

0 commit comments

Comments
 (0)