Merge remote-tracking branch 'upstream/master' into optimize-lazy-equiv

* upstream/master: (23 commits)
  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)
  Add option to choose mfdataset attributes source. (pydata#3498)
  How do I add a new variable to dataset. (pydata#3679)
  Add map_blocks example to whats-new (pydata#3682)
  Make dask names change when chunking Variables by different amounts. (pydata#3584)
  raise an error when renaming dimensions to existing names (pydata#3645)
  ...

.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

ci/requirements/doc.yml

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

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

@@ -25,7 +25,7 @@ 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

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