Skip to content

Commit a668341

Browse files
authored
Force rasterio version to fix PROJ4 to WKT change (#595)
* Force rasterio version to fix PROJ4 to WKT change See pydata/xarray#2715 * Try escaping quotes in travis CI * Try single quotes in travis reqs * Try no quotes in travis config
1 parent 5c5f0c5 commit a668341

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ env:
55
- PYTHON_VERSION=$TRAVIS_PYTHON_VERSION
66
- NUMPY_VERSION=stable
77
- MAIN_CMD='python setup.py'
8-
- CONDA_DEPENDENCIES='xarray dask 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'
8+
- CONDA_DEPENDENCIES='xarray dask toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coveralls coverage codecov behave netcdf4 h5py h5netcdf gdal rasterio<1.0.14 imageio pyhdf mock libtiff pycoast pydecorate'
99
- PIP_DEPENDENCIES='trollsift trollimage pyspectral pyorbital libtiff'
1010
- SETUP_XVFB=False
1111
- EVENT_TYPE='push pull_request'

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ environment:
33
PYTHON: "C:\\conda"
44
MINICONDA_VERSION: "latest"
55
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
6-
CONDA_DEPENDENCIES: "xarray dask toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coverage netcdf4 h5py h5netcdf gdal rasterio imageio pyhdf mock libtiff pycoast pydecorate"
6+
CONDA_DEPENDENCIES: "xarray dask toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coverage netcdf4 h5py h5netcdf gdal 'rasterio<1.0.14' imageio pyhdf mock libtiff pycoast pydecorate"
77
PIP_DEPENDENCIES: "trollsift trollimage pyspectral pyorbital libtiff"
88
CONDA_CHANNELS: "conda-forge"
99

0 commit comments

Comments
 (0)