datarevenue-berlin · kayibal · Dec 4, 2018 · Mar 7, 2018 · Mar 7, 2018 · Mar 9, 2018
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,6 +6,7 @@ jobs:
       - image: drtools/dask:latest
     steps:
       - checkout
-      - run: pip install pytest pytest-cov moto dask==0.19.2 .
+      - run: pip install boto3==1.7.84 botocore==1.10.84 moto==1.3.6
+      - run: pip install pytest pytest-cov dask==1.0.0 .
       - run: py.test --cov sparsity --cov-report xml sparsity
       - run: bash <(curl -s https://codecov.io/bash)
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
         'scipy>=0.18.1',
         'numpy>=1.12.0',
         's3fs>=0.1.0',
-        'dask>0.19.2'
+        'dask>0.20.0'
     ],
     test_requires=[
         'moto',

diff --git a/sparsity/dask/core.py b/sparsity/dask/core.py
@@ -198,7 +198,7 @@ def join(self, other, on=None, how='left', lsuffix='',
             # make empty meta
             meta = meta.loc[[False] * meta.shape[0], :]
             join_func = partial(sp.SparseFrame.join, other=other,
-                                how='left')
+                                how=how)
             return self.map_partitions(join_func, meta=meta, name='simplejoin')
         if not isinstance(other, (SparseFrame)):
             raise ValueError('other must be SparseFrame')

diff --git a/sparsity/test/test_dask_sparse_frame.py b/sparsity/test/test_dask_sparse_frame.py
@@ -14,7 +14,7 @@
 
 from .conftest import tmpdir
 
-dask.context.set_options(get=dask.local.get_sync)
+dask.config.set(scheduler=dask.local.get_sync)
 
 
 @pytest.fixture