diff --git a/distributed/client.py b/distributed/client.py index 75e8d976ee..b038c0e46f 100644 --- a/distributed/client.py +++ b/distributed/client.py @@ -49,7 +49,7 @@ from dask.highlevelgraph import HighLevelGraph from dask.layers import Layer from dask.optimization import SubgraphCallable -from dask.base import tokenize +from dask.tokenize import tokenize from dask.typing import Key, NoDefault, no_default from dask.utils import ( apply, diff --git a/distributed/diagnostics/progress.py b/distributed/diagnostics/progress.py index 3fd7bbbd07..1712cc5df3 100644 --- a/distributed/diagnostics/progress.py +++ b/distributed/diagnostics/progress.py @@ -9,7 +9,7 @@ from tlz import groupby, valmap -from dask.base import tokenize +from dask.tokenize import tokenize from dask.utils import key_split from distributed.diagnostics.plugin import SchedulerPlugin diff --git a/distributed/protocol/serialize.py b/distributed/protocol/serialize.py index 300e27631b..4ad5c3f98a 100644 --- a/distributed/protocol/serialize.py +++ b/distributed/protocol/serialize.py @@ -15,7 +15,7 @@ import dask from dask.sizeof import sizeof -from dask.base import normalize_token +from dask.tokenize import normalize_token from dask.utils import typename from distributed.metrics import context_meter diff --git a/distributed/scheduler.py b/distributed/scheduler.py index 9b9828f804..64ad6d964f 100644 --- a/distributed/scheduler.py +++ b/distributed/scheduler.py @@ -55,7 +55,7 @@ import dask import dask.utils from dask.core import get_deps, iskey, validate_key -from dask.base import TokenizationError, normalize_token, tokenize +from dask.tokenize import TokenizationError, normalize_token, tokenize from dask.typing import Key, no_default from dask.utils import ( _deprecated, diff --git a/distributed/shuffle/_merge.py b/distributed/shuffle/_merge.py index 735c8f637f..0fb403a3f8 100644 --- a/distributed/shuffle/_merge.py +++ b/distributed/shuffle/_merge.py @@ -8,7 +8,7 @@ from dask.base import is_dask_collection from dask.highlevelgraph import HighLevelGraph from dask.layers import Layer -from dask.base import tokenize +from dask.tokenize import tokenize from distributed.shuffle._arrow import check_minimal_arrow_version from distributed.shuffle._core import ShuffleId, barrier_key, get_worker_plugin diff --git a/distributed/shuffle/_rechunk.py b/distributed/shuffle/_rechunk.py index ef233e4ed3..15e3ea1d78 100644 --- a/distributed/shuffle/_rechunk.py +++ b/distributed/shuffle/_rechunk.py @@ -123,7 +123,7 @@ import dask.config from dask.highlevelgraph import HighLevelGraph from dask.layers import Layer -from dask.base import tokenize +from dask.tokenize import tokenize from dask.typing import Key from dask.utils import parse_bytes diff --git a/distributed/shuffle/_shuffle.py b/distributed/shuffle/_shuffle.py index cced6a5019..154f25c4ba 100644 --- a/distributed/shuffle/_shuffle.py +++ b/distributed/shuffle/_shuffle.py @@ -23,7 +23,7 @@ import dask from dask.highlevelgraph import HighLevelGraph from dask.layers import Layer -from dask.base import tokenize +from dask.tokenize import tokenize from dask.typing import Key from distributed.core import PooledRPCCall diff --git a/distributed/tests/test_client.py b/distributed/tests/test_client.py index fd1d9563e1..0016294e70 100644 --- a/distributed/tests/test_client.py +++ b/distributed/tests/test_client.py @@ -43,7 +43,7 @@ import dask.bag as db from dask import delayed from dask.optimization import SubgraphCallable -from dask.base import tokenize +from dask.tokenize import tokenize from dask.utils import get_default_shuffle_method, parse_timedelta, tmpfile from distributed import ( @@ -1127,7 +1127,7 @@ async def test_scatter_non_list(c, s, a, b): @gen_cluster(client=True) async def test_scatter_tokenize_local(c, s, a, b): - from dask.base import normalize_token + from dask.tokenize import normalize_token class MyObj: pass