From e262a15a222eb21627b30c182fc303d5f03db7c2 Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Fri, 18 Jan 2019 10:34:14 -0800 Subject: [PATCH 1/3] try no rasterio in py36 env --- ci/requirements-py36.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml index 311e4a275a8..70536c50479 100644 --- a/ci/requirements-py36.yml +++ b/ci/requirements-py36.yml @@ -20,7 +20,7 @@ dependencies: - scipy - seaborn - toolz - - rasterio + # - rasterio # xref #2683 - bottleneck - zarr - pseudonetcdf>=3.0.1 From 1e1c00fd89d1441f901f30823949bdac184c09fa Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Fri, 18 Jan 2019 10:45:43 -0800 Subject: [PATCH 2/3] no pynio or iris either --- ci/requirements-py36.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml index 70536c50479..0ed6dd78c3a 100644 --- a/ci/requirements-py36.yml +++ b/ci/requirements-py36.yml @@ -26,8 +26,8 @@ dependencies: - pseudonetcdf>=3.0.1 - eccodes - cdms2 - - pynio - - iris>=1.10 + # - pynio # xref #2683 + # - iris>=1.10 # xref #2683 - pydap - lxml - pip: From d8eef3538637eb731479f6276a602dbfdc0873ea Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Fri, 18 Jan 2019 12:29:41 -0800 Subject: [PATCH 3/3] pin min gdal version in doc build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e1866de8d4..a21d4d94413 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 ;