Skip to content
This repository has been archived by the owner on Feb 10, 2021. It is now read-only.

Commit

Permalink
Tornado 5 fix (#61)
Browse files Browse the repository at this point in the history
* Tornado 5 fix

* Dummy commit

* Use PeriodicCallback from distributed.utils

* Require distributed 1.20.0+

Need this version to get a compat function from distributed for
`PeriodicCallback` that smooths over the Tornado 5.0 differences.

* Require distributed 1.20.0+ for testing

Update the `env.yml` file used for testing to require distributed
1.20.0+.
  • Loading branch information
lesteve authored and jakirkham committed Mar 9, 2018
1 parent 9651340 commit ea34911
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions dask_drmaa/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
import drmaa
from toolz import merge
from tornado import gen
from tornado.ioloop import PeriodicCallback

from distributed import LocalCluster
from distributed.utils import log_errors, ignoring
from distributed.protocol.pickle import dumps
from distributed.utils import PeriodicCallback

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -164,8 +163,7 @@ def remove_script():
template or {})

self._cleanup_callback = PeriodicCallback(callback=self.cleanup_closed_workers,
callback_time=cleanup_interval,
io_loop=self.scheduler.loop)
callback_time=cleanup_interval)
self._cleanup_callback.start()

self.workers = {} # {job-id: WorkerSpec}
Expand Down
2 changes: 1 addition & 1 deletion env.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: drmaa
dependencies:
- dask
- distributed
- distributed>=1.20.0
- ipython
- drmaa
- python=3
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dask
distributed
distributed >= 1.20.0
drmaa
click

0 comments on commit ea34911

Please sign in to comment.