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)
yohai · Jan 2, 2019 · faf4302 · faf4302
2 parents 3d40dab + faacc8d
commit faf4302
Show file tree

Hide file tree

Showing 76 changed files with 1,352 additions and 569 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,7 @@ branches:
 matrix:
   fast_finish: true
   include:
-  - env: CONDA_ENV=py27-min
-  - env: CONDA_ENV=py27-cdat+iris+pynio
+  - env: CONDA_ENV=py35-min
   - env: CONDA_ENV=py35
   - env: CONDA_ENV=py36
   - env: CONDA_ENV=py37
@@ -29,9 +28,10 @@ matrix:
   - env: CONDA_ENV=py36-bottleneck-dev
   - env: CONDA_ENV=py36-condaforge-rc
   - env: CONDA_ENV=py36-pynio-dev
-  - env: CONDA_ENV=py36-rasterio-0.36
+  - env: CONDA_ENV=py36-rasterio
   - env: CONDA_ENV=py36-zarr-dev
   - env: CONDA_ENV=docs
+  - env: CONDA_ENV=flake8
   - env: CONDA_ENV=py36-hypothesis
 
   allow_failures:
@@ -62,6 +62,8 @@ before_install:
 install:
   - if [[ "$CONDA_ENV" == "docs" ]]; then
       conda env create -n test_env --file doc/environment.yml;
+    elif [[ "$CONDA_ENV" == "flake8" ]]; then
+      conda env create -n test_env --file ci/requirements-py37.yml;
     else
       conda env create -n test_env --file ci/requirements-$CONDA_ENV.yml;
     fi
@@ -77,6 +79,8 @@ script:
   - if [[ "$CONDA_ENV" == "docs" ]]; then
       conda install -c conda-forge sphinx sphinx_rtd_theme sphinx-gallery numpydoc;
       sphinx-build -n -j auto -b html -d _build/doctrees doc _build/html;
+    elif [[ "$CONDA_ENV" == "flake8" ]]; then
+      flake8 xarray ;
     elif [[ "$CONDA_ENV" == "py36-hypothesis" ]]; then
       pytest properties ;
     else

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,15 +7,14 @@ branches:
 environment:
 
   matrix:
-    - PYTHON: "C:\\Python27-conda64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      CONDA_ENV: "py27-windows"
-
     - PYTHON: "C:\\Python36-conda64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       CONDA_ENV: "py36-windows"
+    - PYTHON: "C:\\Python37-conda64"
+      PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "64"
+      CONDA_ENV: "py37-windows"
 
 install:
   # Install miniconda Python

diff --git a/ci/requirements-py27-cdat+iris+pynio.yml b/ci/requirements-py27-cdat+iris+pynio.yml
diff --git a/ci/requirements-py27-min.yml → ci/requirements-py35-min.yml b/ci/requirements-py27-min.yml → ci/requirements-py35-min.yml
@@ -1,11 +1,12 @@
 name: test_env
 dependencies:
-  - python=2.7
+  - python=3.5
   - pytest
   - flake8
   - mock
   - numpy=1.12
   - pandas=0.19
   - pip:
-    - coveralls
+    - pytest-env
     - pytest-cov
+    - coveralls
diff --git a/ci/requirements-py35.yml b/ci/requirements-py35.yml
@@ -10,6 +10,9 @@ dependencies:
   - matplotlib=1.5
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -18,6 +21,3 @@ dependencies:
   - toolz
   - rasterio
   - zarr
-  - pip:
-    - coveralls
-    - pytest-cov
diff --git a/ci/requirements-py36-bottleneck-dev.yml b/ci/requirements-py36-bottleneck-dev.yml
@@ -11,6 +11,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -19,5 +22,3 @@ dependencies:
   - toolz
   - pip:
     - git+https://github.com/kwgoodman/bottleneck.git
-    - coveralls
-    - pytest-cov
diff --git a/ci/requirements-py36-condaforge-rc.yml b/ci/requirements-py36-condaforge-rc.yml
@@ -12,12 +12,12 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
   - seaborn
   - scipy
   - toolz
-  - pip:
-    - coveralls
-    - pytest-cov
diff --git a/ci/requirements-py36-dask-dev.yml b/ci/requirements-py36-dask-dev.yml
@@ -9,6 +9,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -20,7 +23,5 @@ dependencies:
   - zarr
   - pseudonetcdf>=3.0.1
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/dask/dask.git
     - git+https://github.com/dask/distributed.git
diff --git a/ci/requirements-py36-hypothesis.yml b/ci/requirements-py36-hypothesis.yml
@@ -10,6 +10,10 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
+  - hypothesis
   - flake8
   - numpy
   - pandas
@@ -19,9 +23,5 @@ dependencies:
   - rasterio
   - bottleneck
   - zarr
-  - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
-    - lxml
-    - hypothesis
+  - pydap
+  - lxml
diff --git a/ci/requirements-py36-netcdf4-dev.yml b/ci/requirements-py36-netcdf4-dev.yml
@@ -10,13 +10,14 @@ dependencies:
   - h5netcdf
   - matplotlib
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
   - scipy
   - toolz
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/Unidata/netcdf4-python.git
     - git+https://github.com/Unidata/cftime.git
diff --git a/ci/requirements-py36-pandas-dev.yml b/ci/requirements-py36-pandas-dev.yml
@@ -12,11 +12,12 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - scipy
   - toolz
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/pydata/pandas.git
diff --git a/ci/requirements-py36-pynio-dev.yml b/ci/requirements-py36-pynio-dev.yml
@@ -13,14 +13,14 @@ dependencies:
   - netcdf4
   - pynio=dev
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - numpy
   - pandas
   - scipy
   - seaborn
   - toolz
   - rasterio
   - bottleneck
-  - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
+  - pydap
diff --git a/ci/requirements-py36-rasterio-0.36.yml → ci/requirements-py36-rasterio.yml b/ci/requirements-py36-rasterio-0.36.yml → ci/requirements-py36-rasterio.yml
@@ -11,14 +11,14 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - numpy
   - pandas
   - scipy
   - seaborn
   - toolz
-  - rasterio=0.36.0
+  - rasterio>=1.0
   - bottleneck
-  - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
+  - pydap
diff --git a/ci/requirements-py36-windows.yml b/ci/requirements-py36-windows.yml
@@ -11,6 +11,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
   - numpy
   - pandas
   - scipy

diff --git a/ci/requirements-py36-zarr-dev.yml b/ci/requirements-py36-zarr-dev.yml
@@ -8,6 +8,9 @@ dependencies:
   - distributed
   - matplotlib
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -16,6 +19,4 @@ dependencies:
   - toolz
   - bottleneck
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/zarr-developers/zarr.git
diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml
@@ -11,6 +11,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-cov
+  - pytest-env
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -22,9 +25,10 @@ dependencies:
   - zarr
   - pseudonetcdf>=3.0.1
   - eccodes
+  - cdms2
+  - pynio
+  - iris>=1.10
+  - pydap
+  - lxml
   - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
-    - lxml
     - cfgrib>=0.9.2
diff --git a/ci/requirements-py27-windows.yml → ci/requirements-py37-windows.yml b/ci/requirements-py27-windows.yml → ci/requirements-py37-windows.yml
@@ -2,22 +2,20 @@ name: test_env
 channels:
   - conda-forge
 dependencies:
-  - python=2.7
+  - python=3.7
+  - cftime
   - dask
   - distributed
   - h5py
   - h5netcdf
   - matplotlib
-  - pathlib2
+  - netcdf4
   - pytest
-  - flake8
-  - mock
+  - pytest-env
   - numpy
   - pandas
   - scipy
   - seaborn
   - toolz
   - rasterio
   - zarr
-  - pip:
-    - netcdf4
diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml
@@ -11,6 +11,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-cov
+  - pytest-env
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -21,10 +24,8 @@ dependencies:
   - bottleneck
   - zarr
   - pseudonetcdf>=3.0.1
+  - lxml
   - eccodes
+  - pydap
   - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
-    - lxml
     - cfgrib>=0.9.2
diff --git a/doc/examples/weather-data.rst b/doc/examples/weather-data.rst
@@ -17,7 +17,7 @@ Shared setup:
 .. ipython:: python
    :suppress:
 
-    fpath = "doc/examples/_code/weather_data_setup.py"
+    fpath = "examples/_code/weather_data_setup.py"
     with open(fpath) as f:
         code = compile(f.read(), fpath, 'exec')
         exec(code)