Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix py35 build on Travis #2925

Merged
merged 4 commits into from
May 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
23 changes: 0 additions & 23 deletions ci/requirements-py35.yml

This file was deleted.

4 changes: 2 additions & 2 deletions ci/requirements-py36-dask-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ dependencies:
- pytest-env
- coveralls
- flake8
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-py36-hypothesis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies:
- coveralls
- hypothesis
- flake8
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py36-pandas-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- pytest-env
- coveralls
- flake8
- numpy
- numpy>=1.12
- scipy
- toolz
- pip:
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-py36-rasterio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dependencies:
- pytest-cov
- pytest-env
- coveralls
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
Expand Down
5 changes: 2 additions & 3 deletions ci/requirements-py36-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ dependencies:
- netcdf4
- pytest
- pytest-env
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
- rasterio
- zarr

4 changes: 2 additions & 2 deletions ci/requirements-py36-zarr-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dependencies:
- pytest-env
- coveralls
- flake8
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-py36.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies:
- pytest-env
- coveralls
- pycodestyle
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-py37-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ dependencies:
- netcdf4
- pytest
- pytest-env
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-py37.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies:
- pytest-env
- coveralls
- pycodestyle
- numpy
- pandas
- numpy>=1.12
- pandas>=0.19
- scipy
- seaborn
- toolz
Expand Down
1 change: 1 addition & 0 deletions xarray/tests/test_dataarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -3586,6 +3586,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
Expand Down