Skip to content

Commit faf4302

Browse files
author
dcherian
committed
Merge branch 'master' into yohai-ds_scatter
* master: DEP: drop python 2 support and associated ci mods (pydata#2637) TST: silence warnings from bottleneck (pydata#2638) revert to dev version DOC: fix docstrings and doc build for 0.11.1 Source encoding always set when opening datasets (pydata#2626) Add flake check to travis (pydata#2632) Fix dayofweek and dayofyear attributes from dates generated by cftime_range (pydata#2633) silence import warning (pydata#2635) fill_value in shift (pydata#2470) Flake fixed (pydata#2629) Allow passing of positional arguments in `apply` for Groupby objects (pydata#2413) Fix failure in time encoding for pandas < 0.21.1 (pydata#2630) Fix multiindex selection (pydata#2621) Close files when CachingFileManager is garbage collected (pydata#2595) added some logic to deal with rasterio objects in addition to filepaths (pydata#2589) Get 0d slices of ndarrays directly from indexing (pydata#2625) FIX Don't raise a deprecation warning for xarray.ufuncs.{angle,iscomplex} (pydata#2615) CF: also decode time bounds when available (pydata#2571)
2 parents 3d40dab + faacc8d commit faf4302

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1352
-569
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ branches:
1010
matrix:
1111
fast_finish: true
1212
include:
13-
- env: CONDA_ENV=py27-min
14-
- env: CONDA_ENV=py27-cdat+iris+pynio
13+
- env: CONDA_ENV=py35-min
1514
- env: CONDA_ENV=py35
1615
- env: CONDA_ENV=py36
1716
- env: CONDA_ENV=py37
@@ -29,9 +28,10 @@ matrix:
2928
- env: CONDA_ENV=py36-bottleneck-dev
3029
- env: CONDA_ENV=py36-condaforge-rc
3130
- env: CONDA_ENV=py36-pynio-dev
32-
- env: CONDA_ENV=py36-rasterio-0.36
31+
- env: CONDA_ENV=py36-rasterio
3332
- env: CONDA_ENV=py36-zarr-dev
3433
- env: CONDA_ENV=docs
34+
- env: CONDA_ENV=flake8
3535
- env: CONDA_ENV=py36-hypothesis
3636

3737
allow_failures:
@@ -62,6 +62,8 @@ before_install:
6262
install:
6363
- if [[ "$CONDA_ENV" == "docs" ]]; then
6464
conda env create -n test_env --file doc/environment.yml;
65+
elif [[ "$CONDA_ENV" == "flake8" ]]; then
66+
conda env create -n test_env --file ci/requirements-py37.yml;
6567
else
6668
conda env create -n test_env --file ci/requirements-$CONDA_ENV.yml;
6769
fi
@@ -77,6 +79,8 @@ script:
7779
- if [[ "$CONDA_ENV" == "docs" ]]; then
7880
conda install -c conda-forge sphinx sphinx_rtd_theme sphinx-gallery numpydoc;
7981
sphinx-build -n -j auto -b html -d _build/doctrees doc _build/html;
82+
elif [[ "$CONDA_ENV" == "flake8" ]]; then
83+
flake8 xarray ;
8084
elif [[ "$CONDA_ENV" == "py36-hypothesis" ]]; then
8185
pytest properties ;
8286
else

appveyor.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ branches:
77
environment:
88

99
matrix:
10-
- PYTHON: "C:\\Python27-conda64"
11-
PYTHON_VERSION: "2.7"
12-
PYTHON_ARCH: "64"
13-
CONDA_ENV: "py27-windows"
14-
1510
- PYTHON: "C:\\Python36-conda64"
1611
PYTHON_VERSION: "3.6"
1712
PYTHON_ARCH: "64"
1813
CONDA_ENV: "py36-windows"
14+
- PYTHON: "C:\\Python37-conda64"
15+
PYTHON_VERSION: "3.7"
16+
PYTHON_ARCH: "64"
17+
CONDA_ENV: "py37-windows"
1918

2019
install:
2120
# Install miniconda Python

ci/requirements-py27-cdat+iris+pynio.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: test_env
22
dependencies:
3-
- python=2.7
3+
- python=3.5
44
- pytest
55
- flake8
66
- mock
77
- numpy=1.12
88
- pandas=0.19
99
- pip:
10-
- coveralls
10+
- pytest-env
1111
- pytest-cov
12+
- coveralls

ci/requirements-py35.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ dependencies:
1010
- matplotlib=1.5
1111
- netcdf4
1212
- pytest
13+
- pytest-env
14+
- pytest-cov
15+
- coveralls
1316
- flake8
1417
- numpy
1518
- pandas
@@ -18,6 +21,3 @@ dependencies:
1821
- toolz
1922
- rasterio
2023
- zarr
21-
- pip:
22-
- coveralls
23-
- pytest-cov

ci/requirements-py36-bottleneck-dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ dependencies:
1111
- matplotlib
1212
- netcdf4
1313
- pytest
14+
- pytest-env
15+
- pytest-cov
16+
- coveralls
1417
- flake8
1518
- numpy
1619
- pandas
@@ -19,5 +22,3 @@ dependencies:
1922
- toolz
2023
- pip:
2124
- git+https://github.com/kwgoodman/bottleneck.git
22-
- coveralls
23-
- pytest-cov

ci/requirements-py36-condaforge-rc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ dependencies:
1212
- matplotlib
1313
- netcdf4
1414
- pytest
15+
- pytest-env
16+
- pytest-cov
17+
- coveralls
1518
- flake8
1619
- numpy
1720
- pandas
1821
- seaborn
1922
- scipy
2023
- toolz
21-
- pip:
22-
- coveralls
23-
- pytest-cov

ci/requirements-py36-dask-dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ dependencies:
99
- matplotlib
1010
- netcdf4
1111
- pytest
12+
- pytest-env
13+
- pytest-cov
14+
- coveralls
1215
- flake8
1316
- numpy
1417
- pandas
@@ -20,7 +23,5 @@ dependencies:
2023
- zarr
2124
- pseudonetcdf>=3.0.1
2225
- pip:
23-
- coveralls
24-
- pytest-cov
2526
- git+https://github.com/dask/dask.git
2627
- git+https://github.com/dask/distributed.git

ci/requirements-py36-hypothesis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ dependencies:
1010
- matplotlib
1111
- netcdf4
1212
- pytest
13+
- pytest-env
14+
- pytest-cov
15+
- coveralls
16+
- hypothesis
1317
- flake8
1418
- numpy
1519
- pandas
@@ -19,9 +23,5 @@ dependencies:
1923
- rasterio
2024
- bottleneck
2125
- zarr
22-
- pip:
23-
- coveralls
24-
- pytest-cov
25-
- pydap
26-
- lxml
27-
- hypothesis
26+
- pydap
27+
- lxml

ci/requirements-py36-netcdf4-dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ dependencies:
1010
- h5netcdf
1111
- matplotlib
1212
- pytest
13+
- pytest-env
14+
- pytest-cov
15+
- coveralls
1316
- flake8
1417
- numpy
1518
- pandas
1619
- scipy
1720
- toolz
1821
- pip:
19-
- coveralls
20-
- pytest-cov
2122
- git+https://github.com/Unidata/netcdf4-python.git
2223
- git+https://github.com/Unidata/cftime.git

0 commit comments

Comments
 (0)