Merge branch 'master' of github.com:pydata/xarray into sel_categorilical

* 'master' of github.com:pydata/xarray: (27 commits)
  bump min deps for 0.15 (pydata#3713)
  setuptools-scm and isort tweaks (pydata#3720)
  Allow binned coordinates on 1D plots y-axis. (pydata#3685)
  apply_ufunc: Add meta kwarg + bump dask to 2.2 (pydata#3660)
  setuptools-scm and one-liner setup.py (pydata#3714)
  Feature/align in dot (pydata#3699)
  ENH: enable `H5NetCDFStore` to work with already open h5netcdf.File a… (pydata#3618)
  One-off isort run (pydata#3705)
  hardcoded xarray.__all__ (pydata#3703)
  Bump mypy to v0.761 (pydata#3704)
  remove DataArray and Dataset constructor deprecations for 0.15  (pydata#3560)
  Tests for variables with units (pydata#3654)
  Add an example notebook using apply_ufunc to vectorize 1D functions (pydata#3629)
  Use encoding['dtype'] over data.dtype when possible within CFMaskCoder.encode (pydata#3652)
  allow passing any iterable to drop when dropping variables (pydata#3693)
  Typo on DataSet/DataArray.to_dict documentation (pydata#3692)
  Fix mypy type checking tests failure in ds.merge (pydata#3690)
  Explicitly convert result of pd.to_datetime to a timezone-naive type (pydata#3688)
  ds.merge(da) bugfix (pydata#3677)
  fix docstring for combine_first: returns a Dataset (pydata#3683)
  ...

.coveragerc

@@ -5,4 +5,3 @@ omit =
     xarray/core/npcompat.py
     xarray/core/pdcompat.py
     xarray/core/pycompat.py
-    xarray/_version.py

.gitattributes

@@ -1,3 +1,2 @@
 # reduce the number of merge conflicts
 doc/whats-new.rst merge=union
-xarray/_version.py export-subst

.gitignore

@@ -15,6 +15,7 @@ doc/savefig
 # Packages
 *.egg
 *.egg-info
+.eggs
 dist
 build
 eggs
@@ -65,7 +66,6 @@ dask-worker-space/
 # xarray specific
 doc/_build
 doc/generated
-xarray/version.py
 xarray/tests/data/*.grib.*.idx
 
 # Sync tools

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.730  # Must match ci/requirements/*.yml
+    rev: v0.761  # Must match ci/requirements/*.yml
     hooks:
       - id: mypy
   # run these occasionally, ref discussion https://github.com/pydata/xarray/pull/3194

MANIFEST.in

@@ -4,6 +4,4 @@ recursive-include doc *
 prune doc/_build
 prune doc/generated
 global-exclude .DS_Store
-include versioneer.py
-include xarray/_version.py
 recursive-include xarray/static *

ci/requirements/doc.yml

@@ -14,9 +14,10 @@ dependencies:
   - jupyter_client
   - nbsphinx
   - netcdf4
+  - numba
   - numpy
   - numpydoc
-  - pandas<0.25  # Hack around https://github.com/pydata/xarray/issues/3369
+  - pandas
   - rasterio
   - seaborn
   - sphinx

ci/requirements/py36-bare-minimum.yml

@@ -7,5 +7,5 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-env
-  - numpy=1.14
-  - pandas=0.24
+  - numpy=1.15
+  - pandas=0.25

ci/requirements/py36-min-all-deps.yml

@@ -15,8 +15,8 @@ dependencies:
   - cfgrib=0.9
   - cftime=1.0
   - coveralls
-  - dask=1.2
-  - distributed=1.27
+  - dask=2.2
+  - distributed=2.2
   - flake8
   - h5netcdf=0.7
   - h5py=2.9  # Policy allows for 2.10, but it's a conflict-fest
@@ -25,12 +25,12 @@ dependencies:
   - iris=2.2
   - lxml=4.4  # Optional dep of pydap
   - matplotlib=3.1
-  - mypy=0.730  # Must match .pre-commit-config.yaml
+  - mypy=0.761  # Must match .pre-commit-config.yaml
   - nc-time-axis=1.2
   - netcdf4=1.4
   - numba=0.44
-  - numpy=1.14
-  - pandas=0.24
+  - numpy=1.15
+  - pandas=0.25
   # - pint  # See py36-min-nep18.yml
   - pip
   - pseudonetcdf=3.0
@@ -40,7 +40,7 @@ dependencies:
   - pytest-cov
   - pytest-env
   - rasterio=1.0
-  - scipy=1.0  # Policy allows for 1.2, but scipy>=1.1 breaks numpy=1.14
+  - scipy=1.3
   - seaborn=0.9
   # - sparse  # See py36-min-nep18.yml
   - toolz=0.10

ci/requirements/py36-min-nep18.yml

@@ -9,7 +9,7 @@ dependencies:
   - dask=2.4
   - distributed=2.4
   - numpy=1.17
-  - pandas=0.24
+  - pandas=0.25
   - pint=0.9  # Actually not enough as it doesn't implement __array_function__yet!
   - pytest
   - pytest-cov

ci/requirements/py36.yml

@@ -21,7 +21,7 @@ dependencies:
   - iris
   - lxml    # optional dep of pydap
   - matplotlib
-  - mypy=0.730  # Must match .pre-commit-config.yaml
+  - mypy=0.761  # Must match .pre-commit-config.yaml
   - nc-time-axis
   - netcdf4
   - numba

ci/requirements/py37-windows.yml

@@ -21,7 +21,7 @@ dependencies:
   - iris
   - lxml    # Optional dep of pydap
   - matplotlib
-  - mypy=0.730  # Must match .pre-commit-config.yaml
+  - mypy=0.761  # Must match .pre-commit-config.yaml
   - nc-time-axis
   - netcdf4
   - numba

ci/requirements/py37.yml

@@ -21,7 +21,7 @@ dependencies:
   - iris
   - lxml    # Optional dep of pydap
   - matplotlib
-  - mypy=0.730  # Must match .pre-commit-config.yaml
+  - mypy=0.761  # Must match .pre-commit-config.yaml
   - nc-time-axis
   - netcdf4
   - numba

doc/conf.py

@@ -25,7 +25,7 @@
 os.environ["PYTHONPATH"] = str(root)
 sys.path.insert(0, str(root))
 
-import xarray
+import xarray  # isort:skip
 
 allowed_failures = set()
 

doc/data-structures.rst

@@ -353,6 +353,8 @@ setting) variables and attributes:
 This is particularly useful in an exploratory context, because you can
 tab-complete these variable names with tools like IPython.
 
+.. _dictionary_like_methods:
+
 Dictionary like methods
 ~~~~~~~~~~~~~~~~~~~~~~~
 

doc/examples.rst

@@ -10,3 +10,10 @@ Examples
     examples/visualization_gallery
     examples/ROMS_ocean_model
     examples/ERA5-GRIB-example
+
+Using apply_ufunc
+------------------
+.. toctree::
+    :maxdepth: 2
+
+    examples/apply_ufunc_vectorize_1d