Merge pull request #424 from itamarst/423-dask2

itamarst · web-flow · commit 7a5815c54e4b · 2019-07-22T14:10:08.000-04:00
Add support for Dask 2.0+.
diff --git a/docs/source/news.rst b/docs/source/news.rst
@@ -4,9 +4,10 @@ What's New
 1.10.0
 ^^^^^^
 
-Bug fix:
+Bug fixes:
 
 * ``@eliot.testing.capture_logging`` now passes ``*args`` and ``**kwargs`` to the wrapped function, as one would expect. Fixes #420. Thanks to Jean-Paul Calderone for the bug report.
+* Eliot works with Dask 2.0. Thanks to Dan Myung for the bug report.
 
 1.9.0
 ^^^^^
diff --git a/eliot/dask.py b/eliot/dask.py
@@ -127,7 +127,7 @@ def simplify(k):
         )
         result[key] = (wrapped_func,) + tuple(args)
 
-    assert result.keys() == dsk.keys()
+    assert set(result.keys()) == set(dsk.keys())
     return result
 
 
diff --git a/tox.ini b/tox.ini
@@ -20,7 +20,7 @@ commands =
 [testenv:py35-numpy]
 basepython = python3.5
 deps = numpy
-       dask[bag]
+       dask[bag]==1.2.1
 
 [testenv:py36]
 basepython = python3.6
@@ -30,6 +30,7 @@ deps = cffi
 [testenv:py37]
 basepython = python3.7
 deps = cffi
+       dask[bag]
 
 [testenv:py35-twisted-latest]
 basepython = python3.5

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ def simplify(k):`
`127`	`127`	`)`
`128`	`128`	`result[key] = (wrapped_func,) + tuple(args)`
`129`	`129`
`130`		`- assert result.keys() == dsk.keys()`
	`130`	`+ assert set(result.keys()) == set(dsk.keys())`
`131`	`131`	`return result`
`132`	`132`
`133`	`133`