Skip to content

Commit ccd0b04

Browse files
authored
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
1 parent dd99b7d commit ccd0b04

12 files changed

+18
-42
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ matrix:
1111
fast_finish: true
1212
include:
1313
- env: CONDA_ENV=py35-min
14-
- env: CONDA_ENV=py35
1514
- env: CONDA_ENV=py36
1615
- env: CONDA_ENV=py37
1716
- env:

ci/requirements-py35.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

ci/requirements-py36-dask-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies:
1313
- pytest-env
1414
- coveralls
1515
- flake8
16-
- numpy
17-
- pandas
16+
- numpy>=1.12
17+
- pandas>=0.19
1818
- scipy
1919
- seaborn
2020
- toolz

ci/requirements-py36-hypothesis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dependencies:
1515
- coveralls
1616
- hypothesis
1717
- flake8
18-
- numpy
19-
- pandas
18+
- numpy>=1.12
19+
- pandas>=0.19
2020
- scipy
2121
- seaborn
2222
- toolz

ci/requirements-py36-pandas-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- pytest-env
1717
- coveralls
1818
- flake8
19-
- numpy
19+
- numpy>=1.12
2020
- scipy
2121
- toolz
2222
- pip:

ci/requirements-py36-rasterio.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ dependencies:
1414
- pytest-cov
1515
- pytest-env
1616
- coveralls
17-
- numpy
18-
- pandas
17+
- numpy>=1.12
18+
- pandas>=0.19
1919
- scipy
2020
- seaborn
2121
- toolz

ci/requirements-py36-windows.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ dependencies:
1212
- netcdf4
1313
- pytest
1414
- pytest-env
15-
- numpy
16-
- pandas
15+
- numpy>=1.12
16+
- pandas>=0.19
1717
- scipy
1818
- seaborn
1919
- toolz
2020
- rasterio
2121
- zarr
22-

ci/requirements-py36-zarr-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ dependencies:
1212
- pytest-env
1313
- coveralls
1414
- flake8
15-
- numpy
16-
- pandas
15+
- numpy>=1.12
16+
- pandas>=0.19
1717
- scipy
1818
- seaborn
1919
- toolz

ci/requirements-py36.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dependencies:
1515
- pytest-env
1616
- coveralls
1717
- pycodestyle
18-
- numpy
19-
- pandas
18+
- numpy>=1.12
19+
- pandas>=0.19
2020
- scipy
2121
- seaborn
2222
- toolz

ci/requirements-py37-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies:
1313
- netcdf4
1414
- pytest
1515
- pytest-env
16-
- numpy
17-
- pandas
16+
- numpy>=1.12
17+
- pandas>=0.19
1818
- scipy
1919
- seaborn
2020
- toolz

ci/requirements-py37.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies:
1616
- pytest-env
1717
- coveralls
1818
- pycodestyle
19-
- numpy
20-
- pandas
19+
- numpy>=1.12
20+
- pandas>=0.19
2121
- scipy
2222
- seaborn
2323
- toolz

xarray/tests/test_dataarray.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3594,6 +3594,7 @@ def test_rolling_wrapped_bottleneck(da, name, center, min_periods):
35943594
@pytest.mark.parametrize('center', (True, False, None))
35953595
@pytest.mark.parametrize('min_periods', (1, None))
35963596
@pytest.mark.parametrize('window', (7, 8))
3597+
@pytest.mark.xfail(reason='https://github.com/pydata/xarray/issues/2940')
35973598
def test_rolling_wrapped_dask(da_dask, name, center, min_periods, window):
35983599
pytest.importorskip('dask.array')
35993600
# dask version

0 commit comments

Comments
 (0)