diff --git a/.travis.yml b/.travis.yml index 6df70e92954..223f1df341d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,8 +59,6 @@ matrix: - libhdf5-serial-dev - netcdf-bin - libnetcdf-dev - - python: 3.6 - env: CONDA_ENV=py36-dask-dev - python: 3.6 env: CONDA_ENV=py36-pandas-dev - python: 3.6 diff --git a/ci/requirements-py36-dask-dev.yml b/ci/requirements-py36-dask-dev.yml index 54cdb54e8fc..e580aaf3889 100644 --- a/ci/requirements-py36-dask-dev.yml +++ b/ci/requirements-py36-dask-dev.yml @@ -12,9 +12,13 @@ dependencies: - flake8 - numpy - pandas - - seaborn - scipy + - seaborn - toolz + - rasterio + - bottleneck + - zarr + - pseudonetcdf>=3.0.1 - pip: - coveralls - pytest-cov diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py index 290c7a6e308..cdb578aff6c 100644 --- a/xarray/tests/test_variable.py +++ b/xarray/tests/test_variable.py @@ -1665,6 +1665,12 @@ def test_getitem_fancy(self): def test_getitem_1d_fancy(self): super(TestVariableWithDask, self).test_getitem_1d_fancy() + def test_equals_all_dtypes(self): + import dask + if '0.18.2' <= LooseVersion(dask.__version__) < '0.18.3': + pytest.xfail('https://github.com/pydata/xarray/issues/2318') + super(TestVariableWithDask, self).test_equals_all_dtypes() + def test_getitem_with_mask_nd_indexer(self): import dask.array as da v = Variable(['x'], da.arange(3, chunks=3))