Reference distributed's actual TimeoutError used (#534)

dask · Apr 17, 2022 · 5fae02d · 5fae02d
1 parent fbe2dd4
commit 5fae02d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/dask-gateway-server/dask_gateway_server/backends/inprocess.py b/dask-gateway-server/dask_gateway_server/backends/inprocess.py
@@ -1,7 +1,7 @@
 from dask_gateway.scheduler_preload import make_gateway_client, GatewaySchedulerService
 from distributed import Security, Scheduler, Worker
 from distributed.core import Status
-from tornado import gen
+from distributed.utils import TimeoutError
 
 from .local import UnsafeLocalBackend
 
@@ -100,7 +100,7 @@ async def do_stop_worker(self, worker):
             return
         try:
             await worker.close(timeout=1)
-        except gen.TimeoutError:
+        except TimeoutError:
             pass
 
     async def do_check_workers(self, workers):

diff --git a/dask-gateway-server/setup.py b/dask-gateway-server/setup.py
@@ -103,7 +103,6 @@ def run(self):
     "aiohttp",
     "colorlog",
     "cryptography",
-    "tornado",
     "traitlets",
 ]
 

diff --git a/dask-gateway/setup.py b/dask-gateway/setup.py
@@ -18,7 +18,7 @@
     #
     "click<8.1.0",
     "dask>=2.2.0",
-    "distributed>=2.2.0",
+    "distributed>=2021.01.1",
     "pyyaml",
     "tornado",
 ]

diff --git a/dev-environment.yaml b/dev-environment.yaml
@@ -15,9 +15,9 @@ dependencies:
   - aiohttp # dask-gateway, dask-gateway-server
   - click<8.1.0 # dask-gateway
   - dask # dask-gateway
-  - distributed # dask-gateway
+  - distributed>=2021.01.1 # dask-gateway
   - pyyaml # dask-gateway
-  - tornado # dask-gateway, dask-gateway-server
+  - tornado # dask-gateway
   - colorlog # dask-gateway-server
   - cryptography # dask-gateway-server
   - traitlets # dask-gateway-server