diff --git a/distributed/shuffle/__init__.py b/distributed/shuffle/__init__.py index 2a073116781..178b69cb9b5 100644 --- a/distributed/shuffle/__init__.py +++ b/distributed/shuffle/__init__.py @@ -1,8 +1,13 @@ from __future__ import annotations -from distributed.shuffle.shuffle import rearrange_by_column_p2p -from distributed.shuffle.shuffle_extension import ( - ShuffleId, +from distributed.shuffle._shuffle import rearrange_by_column_p2p +from distributed.shuffle._shuffle_extension import ( ShuffleSchedulerExtension, ShuffleWorkerExtension, ) + +__all__ = [ + "ShuffleSchedulerExtension", + "ShuffleWorkerExtension", + "rearrange_by_column_p2p", +] diff --git a/distributed/shuffle/arrow.py b/distributed/shuffle/_arrow.py similarity index 100% rename from distributed/shuffle/arrow.py rename to distributed/shuffle/_arrow.py diff --git a/distributed/shuffle/multi_comm.py b/distributed/shuffle/_multi_comm.py similarity index 100% rename from distributed/shuffle/multi_comm.py rename to distributed/shuffle/_multi_comm.py diff --git a/distributed/shuffle/multi_file.py b/distributed/shuffle/_multi_file.py similarity index 100% rename from distributed/shuffle/multi_file.py rename to distributed/shuffle/_multi_file.py diff --git a/distributed/shuffle/shuffle.py b/distributed/shuffle/_shuffle.py similarity index 97% rename from distributed/shuffle/shuffle.py rename to distributed/shuffle/_shuffle.py index afb246afd52..5e78a46435e 100644 --- a/distributed/shuffle/shuffle.py +++ b/distributed/shuffle/_shuffle.py @@ -6,7 +6,7 @@ from dask.delayed import Delayed from dask.highlevelgraph import HighLevelGraph, MaterializedLayer -from distributed.shuffle.shuffle_extension import ShuffleId, ShuffleWorkerExtension +from distributed.shuffle._shuffle_extension import ShuffleId, ShuffleWorkerExtension if TYPE_CHECKING: import pandas as pd diff --git a/distributed/shuffle/shuffle_extension.py b/distributed/shuffle/_shuffle_extension.py similarity index 99% rename from distributed/shuffle/shuffle_extension.py rename to distributed/shuffle/_shuffle_extension.py index 0d3e492a2a2..155bde05657 100644 --- a/distributed/shuffle/shuffle_extension.py +++ b/distributed/shuffle/_shuffle_extension.py @@ -22,14 +22,14 @@ import toolz from distributed.protocol import to_serialize -from distributed.shuffle.arrow import ( +from distributed.shuffle._arrow import ( deserialize_schema, dump_batch, list_of_buffers_to_table, load_arrow, ) -from distributed.shuffle.multi_comm import MultiComm -from distributed.shuffle.multi_file import MultiFile +from distributed.shuffle._multi_comm import MultiComm +from distributed.shuffle._multi_file import MultiFile from distributed.utils import log_errors, sync if TYPE_CHECKING: diff --git a/distributed/shuffle/tests/test_graph.py b/distributed/shuffle/tests/test_graph.py index 028b955aa5e..ffa84553110 100644 --- a/distributed/shuffle/tests/test_graph.py +++ b/distributed/shuffle/tests/test_graph.py @@ -13,7 +13,7 @@ from dask.blockwise import Blockwise from dask.utils_test import hlg_layer_topological -from distributed.shuffle.shuffle_extension import ShuffleWorkerExtension +from distributed.shuffle._shuffle_extension import ShuffleWorkerExtension from distributed.utils_test import gen_cluster diff --git a/distributed/shuffle/tests/test_multi_comm.py b/distributed/shuffle/tests/test_multi_comm.py index d45a4d18b93..90919511701 100644 --- a/distributed/shuffle/tests/test_multi_comm.py +++ b/distributed/shuffle/tests/test_multi_comm.py @@ -5,7 +5,7 @@ import pytest -from distributed.shuffle.multi_comm import MultiComm +from distributed.shuffle._multi_comm import MultiComm from distributed.utils_test import gen_test diff --git a/distributed/shuffle/tests/test_multi_file.py b/distributed/shuffle/tests/test_multi_file.py index 16ebc7562c9..9dddd3cd3a7 100644 --- a/distributed/shuffle/tests/test_multi_file.py +++ b/distributed/shuffle/tests/test_multi_file.py @@ -5,7 +5,7 @@ import pytest -from distributed.shuffle.multi_file import MultiFile +from distributed.shuffle._multi_file import MultiFile from distributed.utils_test import gen_test diff --git a/distributed/shuffle/tests/test_shuffle.py b/distributed/shuffle/tests/test_shuffle.py index 48f0194b152..ccaba351787 100644 --- a/distributed/shuffle/tests/test_shuffle.py +++ b/distributed/shuffle/tests/test_shuffle.py @@ -17,7 +17,7 @@ from dask.distributed import Worker from dask.utils import stringify -from distributed.shuffle.shuffle_extension import ( +from distributed.shuffle._shuffle_extension import ( dump_batch, list_of_buffers_to_table, load_arrow, diff --git a/distributed/shuffle/tests/test_shuffle_extension.py b/distributed/shuffle/tests/test_shuffle_extension.py index fe0c53372ce..78b6e3b64fd 100644 --- a/distributed/shuffle/tests/test_shuffle_extension.py +++ b/distributed/shuffle/tests/test_shuffle_extension.py @@ -5,7 +5,7 @@ pd = pytest.importorskip("pandas") dd = pytest.importorskip("dask.dataframe") -from distributed.shuffle.shuffle_extension import ( +from distributed.shuffle._shuffle_extension import ( ShuffleWorkerExtension, get_worker_for, split_by_partition,