Skip to content

Commit

Permalink
try no rasterio in py36 env (#2691)
Browse files Browse the repository at this point in the history
* try no rasterio in py36 env

* no pynio or iris either

* pin min gdal version in doc build
  • Loading branch information
Joe Hamman authored and max-sixty committed Jan 18, 2019
1 parent 1d0a2bc commit 385b36c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ script:
- python --version
- python -OO -c "import xarray"
- if [[ "$CONDA_ENV" == "docs" ]]; then
conda install -c conda-forge sphinx sphinx_rtd_theme sphinx-gallery numpydoc;
conda install -c conda-forge --override-channels sphinx sphinx_rtd_theme sphinx-gallery numpydoc "gdal>2.2.4";
sphinx-build -n -j auto -b html -d _build/doctrees doc _build/html;
elif [[ "$CONDA_ENV" == "lint" ]]; then
pycodestyle xarray ;
Expand Down
6 changes: 3 additions & 3 deletions ci/requirements-py36.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ dependencies:
- scipy
- seaborn
- toolz
- rasterio
# - rasterio # xref #2683
- bottleneck
- zarr
- pseudonetcdf>=3.0.1
- eccodes
- cdms2
- pynio
- iris>=1.10
# - pynio # xref #2683
# - iris>=1.10 # xref #2683
- pydap
- lxml
- pip:
Expand Down

0 comments on commit 385b36c

Please sign in to comment.