Rename get_default_shuffle_algorithm to get_default_shuffle_method (

#7902)

Co-authored-by: James Bourbeau <jrbourbeau@gmail.com>

.pre-commit-config.yaml

@@ -63,5 +63,6 @@ repos:
           - pytest
           - tornado
           - pyarrow
-          - git+https://github.com/dask/dask
+          # - git+https://github.com/dask/dask
+          - git+https://github.com/hendrikmakait/dask.git@default-shuffle-ignores-fuse
           - git+https://github.com/dask/zict

continuous_integration/gpuci/build.sh

@@ -40,12 +40,13 @@ gpuci_logger "Activate conda env"
 . /opt/conda/etc/profile.d/conda.sh
 conda activate dask
 
-gpuci_logger "Install dask"
-python -m pip install git+https://github.com/dask/dask
-
 gpuci_logger "Install distributed"
 python -m pip install -e .
 
+gpuci_logger "Install dask"
+# python -m pip install git+https://github.com/dask/dask
+python -m pip install git+https://github.com/hendrikmakait/dask.git@default-shuffle-ignores-fuse
+
 gpuci_logger "Check Python versions"
 python --version
 

distributed/tests/test_client.py

@@ -40,12 +40,7 @@
 import dask.bag as db
 from dask import delayed
 from dask.optimization import SubgraphCallable
-from dask.utils import (
-    get_default_shuffle_algorithm,
-    parse_timedelta,
-    stringify,
-    tmpfile,
-)
+from dask.utils import get_default_shuffle_method, parse_timedelta, stringify, tmpfile
 
 from distributed import (
     CancelledError,
@@ -3229,25 +3224,25 @@ def test_default_get(loop_in_thread):
         # These may change in the future but the selection below should not
         distributed_default = "p2p" if has_pyarrow else "tasks"
         local_default = "disk"
-        assert get_default_shuffle_algorithm() == local_default
+        assert get_default_shuffle_method() == local_default
         with Client(s["address"], set_as_default=True, loop=loop) as c:
             assert dask.base.get_scheduler() == c.get
-            assert get_default_shuffle_algorithm() == distributed_default
+            assert get_default_shuffle_method() == distributed_default
 
         assert dask.base.get_scheduler() == pre_get
-        assert get_default_shuffle_algorithm() == local_default
+        assert get_default_shuffle_method() == local_default
 
         c = Client(s["address"], set_as_default=False, loop=loop)
         assert dask.base.get_scheduler() == pre_get
-        assert get_default_shuffle_algorithm() == local_default
+        assert get_default_shuffle_method() == local_default
         c.close()
 
         c = Client(s["address"], set_as_default=True, loop=loop)
-        assert get_default_shuffle_algorithm() == distributed_default
+        assert get_default_shuffle_method() == distributed_default
         assert dask.base.get_scheduler() == c.get
         c.close()
         assert dask.base.get_scheduler() == pre_get
-        assert get_default_shuffle_algorithm() == local_default
+        assert get_default_shuffle_method() == local_default
 
         with Client(s["address"], loop=loop) as c:
             assert dask.base.get_scheduler() == c.get