From c55c9599a62350a52db5971cccdbb0010a46ed35 Mon Sep 17 00:00:00 2001 From: Martin Raspaud Date: Wed, 18 Sep 2019 23:43:14 +0200 Subject: [PATCH 1/2] Avoid xarray 0.13.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ed4eb5093..c00518a735 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - PYTHON_VERSION=$TRAVIS_PYTHON_VERSION - NUMPY_VERSION=stable - MAIN_CMD='python setup.py' - - CONDA_DEPENDENCIES='xarray dask distributed toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coveralls coverage codecov behave netcdf4 h5py h5netcdf gdal rasterio imageio pyhdf mock libtiff pycoast pydecorate geoviews zarr six' + - CONDA_DEPENDENCIES='xarray!=0.13.0 dask distributed toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coveralls coverage codecov behave netcdf4 h5py h5netcdf gdal rasterio imageio pyhdf mock libtiff pycoast pydecorate geoviews zarr six' - PIP_DEPENDENCIES='trollsift trollimage pyspectral pyorbital libtiff' - SETUP_XVFB=False - EVENT_TYPE='push pull_request' From e55baedafce517467e6ee42dc80f3612a61b0b21 Mon Sep 17 00:00:00 2001 From: Martin Raspaud Date: Wed, 18 Sep 2019 23:48:50 +0200 Subject: [PATCH 2/2] Remove xarray 0.13.0 from the possible dependencies --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c44ceac989..ae2dc0e8e5 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ pass requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.11.0', 'trollsift', - 'trollimage >=1.5.1', 'pykdtree', 'six', 'pyyaml', 'xarray >=0.10.1', + 'trollimage >=1.5.1', 'pykdtree', 'six', 'pyyaml', 'xarray >=0.10.1, !=0.13.0', 'dask[array] >=0.17.1', 'pyproj', 'zarr'] test_requires = ['behave', 'h5py', 'netCDF4', 'pyhdf', 'imageio', 'libtiff',