From ccd0b047ea8ca89c68ab6cfa942557e676e7d402 Mon Sep 17 00:00:00 2001 From: Stephan Hoyer Date: Fri, 3 May 2019 23:15:54 -0700 Subject: [PATCH] Attempt to fix py35 build on Travis (#2925) * Attempt to fix py35 build on Travis This build is currently install NumPy 1.11, which isn't supported by xarray. Maybe adding minimum numpy and pandas versions will help. * fix pandas version * remove py35 build entirely * xfail failing test --- .travis.yml | 1 - ci/requirements-py35.yml | 23 ----------------------- ci/requirements-py36-dask-dev.yml | 4 ++-- ci/requirements-py36-hypothesis.yml | 4 ++-- ci/requirements-py36-pandas-dev.yml | 2 +- ci/requirements-py36-rasterio.yml | 4 ++-- ci/requirements-py36-windows.yml | 5 ++--- ci/requirements-py36-zarr-dev.yml | 4 ++-- ci/requirements-py36.yml | 4 ++-- ci/requirements-py37-windows.yml | 4 ++-- ci/requirements-py37.yml | 4 ++-- xarray/tests/test_dataarray.py | 1 + 12 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 ci/requirements-py35.yml diff --git a/.travis.yml b/.travis.yml index 212ddb77daa..155c0271b30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ matrix: fast_finish: true include: - env: CONDA_ENV=py35-min - - env: CONDA_ENV=py35 - env: CONDA_ENV=py36 - env: CONDA_ENV=py37 - env: diff --git a/ci/requirements-py35.yml b/ci/requirements-py35.yml deleted file mode 100644 index a71434865cc..00000000000 --- a/ci/requirements-py35.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: test_env -channels: - - conda-forge -dependencies: - - python=3.5 - - cftime - - dask=0.16 - - h5py - - h5netcdf - - matplotlib=1.5 - - netcdf4 - - pytest - - pytest-cov - - pytest-env - - coveralls - - flake8 - - numpy - - pandas - - scipy - - seaborn - - toolz - - rasterio - - zarr diff --git a/ci/requirements-py36-dask-dev.yml b/ci/requirements-py36-dask-dev.yml index 32d01765439..29603a59f7e 100644 --- a/ci/requirements-py36-dask-dev.yml +++ b/ci/requirements-py36-dask-dev.yml @@ -13,8 +13,8 @@ dependencies: - pytest-env - coveralls - flake8 - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz diff --git a/ci/requirements-py36-hypothesis.yml b/ci/requirements-py36-hypothesis.yml index 8066a53b6bc..495f81c9d3a 100644 --- a/ci/requirements-py36-hypothesis.yml +++ b/ci/requirements-py36-hypothesis.yml @@ -15,8 +15,8 @@ dependencies: - coveralls - hypothesis - flake8 - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz diff --git a/ci/requirements-py36-pandas-dev.yml b/ci/requirements-py36-pandas-dev.yml index bc0e5d0de09..05d2c11486c 100644 --- a/ci/requirements-py36-pandas-dev.yml +++ b/ci/requirements-py36-pandas-dev.yml @@ -16,7 +16,7 @@ dependencies: - pytest-env - coveralls - flake8 - - numpy + - numpy>=1.12 - scipy - toolz - pip: diff --git a/ci/requirements-py36-rasterio.yml b/ci/requirements-py36-rasterio.yml index e5ef1d29777..7307ed60d9a 100644 --- a/ci/requirements-py36-rasterio.yml +++ b/ci/requirements-py36-rasterio.yml @@ -14,8 +14,8 @@ dependencies: - pytest-cov - pytest-env - coveralls - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz diff --git a/ci/requirements-py36-windows.yml b/ci/requirements-py36-windows.yml index b139d5c78ca..22d917e332c 100644 --- a/ci/requirements-py36-windows.yml +++ b/ci/requirements-py36-windows.yml @@ -12,11 +12,10 @@ dependencies: - netcdf4 - pytest - pytest-env - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz - rasterio - zarr - diff --git a/ci/requirements-py36-zarr-dev.yml b/ci/requirements-py36-zarr-dev.yml index 94bdc50fbfe..2dbdf172b6c 100644 --- a/ci/requirements-py36-zarr-dev.yml +++ b/ci/requirements-py36-zarr-dev.yml @@ -12,8 +12,8 @@ dependencies: - pytest-env - coveralls - flake8 - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml index 7a3f0f53223..03242426a36 100644 --- a/ci/requirements-py36.yml +++ b/ci/requirements-py36.yml @@ -15,8 +15,8 @@ dependencies: - pytest-env - coveralls - pycodestyle - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz diff --git a/ci/requirements-py37-windows.yml b/ci/requirements-py37-windows.yml index fb4b97cde7c..1ad310a12e0 100644 --- a/ci/requirements-py37-windows.yml +++ b/ci/requirements-py37-windows.yml @@ -13,8 +13,8 @@ dependencies: - netcdf4 - pytest - pytest-env - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml index 4f4d2b1728b..0cece4ed6dd 100644 --- a/ci/requirements-py37.yml +++ b/ci/requirements-py37.yml @@ -16,8 +16,8 @@ dependencies: - pytest-env - coveralls - pycodestyle - - numpy - - pandas + - numpy>=1.12 + - pandas>=0.19 - scipy - seaborn - toolz diff --git a/xarray/tests/test_dataarray.py b/xarray/tests/test_dataarray.py index 58eb6a1d6dc..a8655bbbf8c 100644 --- a/xarray/tests/test_dataarray.py +++ b/xarray/tests/test_dataarray.py @@ -3594,6 +3594,7 @@ def test_rolling_wrapped_bottleneck(da, name, center, min_periods): @pytest.mark.parametrize('center', (True, False, None)) @pytest.mark.parametrize('min_periods', (1, None)) @pytest.mark.parametrize('window', (7, 8)) +@pytest.mark.xfail(reason='https://github.com/pydata/xarray/issues/2940') def test_rolling_wrapped_dask(da_dask, name, center, min_periods, window): pytest.importorskip('dask.array') # dask version