Remove deprecation in wait_for_workers

dask · Sep 18, 2023 · 1044952 · 1044952
1 parent a6d63dc
commit 1044952
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/distributed/client.py b/distributed/client.py
@@ -1437,11 +1437,7 @@ def running_workers(info):
             info = await self.scheduler.identity()
             self._scheduler_identity = SchedulerInfo(info)
 
-    def wait_for_workers(
-        self,
-        n_workers: int | str = no_default,
-        timeout: float | None = None,
-    ) -> None:
+    def wait_for_workers(self, n_workers: int, timeout: float | None = None) -> None:
         """Blocking call to wait for n workers before continuing
 
         Parameters
@@ -1452,13 +1448,7 @@ def wait_for_workers(
             Time in seconds after which to raise a
             ``dask.distributed.TimeoutError``
         """
-        if n_workers is no_default:
-            warnings.warn(
-                "Please specify the `n_workers` argument when using `Client.wait_for_workers`. Not specifying `n_workers` will no longer be supported in future versions.",
-                FutureWarning,
-            )
-            n_workers = 0
-        elif not isinstance(n_workers, int) or n_workers < 1:
+        if not isinstance(n_workers, int) or n_workers < 1:
             raise ValueError(
                 f"`n_workers` must be a positive integer. Instead got {n_workers}."
             )

diff --git a/distributed/deploy/cluster.py b/distributed/deploy/cluster.py
@@ -621,9 +621,7 @@ def running_workers(info):
 
             self.scheduler_info = SchedulerInfo(await self.scheduler_comm.identity())
 
-    def wait_for_workers(
-        self, n_workers: int | str = no_default, timeout: float | None = None
-    ) -> None:
+    def wait_for_workers(self, n_workers: int, timeout: float | None = None) -> None:
         """Blocking call to wait for n workers before continuing
 
         Parameters
@@ -634,13 +632,7 @@ def wait_for_workers(
             Time in seconds after which to raise a
             ``dask.distributed.TimeoutError``
         """
-        if n_workers is no_default:
-            warnings.warn(
-                "Please specify the `n_workers` argument when using `Client.wait_for_workers`. Not specifying `n_workers` will no longer be supported in future versions.",
-                FutureWarning,
-            )
-            n_workers = 0
-        elif not isinstance(n_workers, int) or n_workers < 1:
+        if not isinstance(n_workers, int) or n_workers < 1:
             raise ValueError(
                 f"`n_workers` must be a positive integer. Instead got {n_workers}."
             )

diff --git a/distributed/tests/test_client.py b/distributed/tests/test_client.py
@@ -8387,15 +8387,6 @@ class MyException(Exception):
     assert (stop - start) < 2
 
 
-@gen_cluster(client=True, nthreads=[])
-async def test_wait_for_workers_no_default(c, s):
-    with pytest.warns(
-        FutureWarning,
-        match="specify the `n_workers` argument when using `Client.wait_for_workers`",
-    ):
-        await c.wait_for_workers()
-
-
 @pytest.mark.parametrize(
     "value, exception",
     [