Merge branch 'master' into propagate-attrs

Author: max-sixty

.pre-commit-config.yaml

@@ -2,24 +2,24 @@
 repos:
   # isort should run before black as black sometimes tweaks the isort output
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.1.0
+    rev: 5.4.2
     hooks:
       - id: isort
   # https://github.com/python/black#version-control-integration
-  - repo: https://github.com/python/black
-    rev: stable
+  - repo: https://github.com/psf/black
+    rev: 20.8b1
     hooks:
       - id: black
   - repo: https://github.com/keewis/blackdoc
-    rev: stable
+    rev: v0.1.2
     hooks:
       - id: blackdoc
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.8.3
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.780  # Must match ci/requirements/*.yml
+    rev: v0.782  # Must match ci/requirements/*.yml
     hooks:
       - id: mypy
   # run this occasionally, ref discussion https://github.com/pydata/xarray/pull/3194

ci/requirements/doc.yml

@@ -24,7 +24,11 @@ dependencies:
   - rasterio>=1.1
   - seaborn
   - setuptools
-  - sphinx=3.1
+  - sphinx=3.2
   - sphinx_rtd_theme>=0.4
   - sphinx-autosummary-accessors
   - zarr>=2.4
+  - pip
+  - pip:
+      # relative to this file. Needs to be editable to be accepted.
+      - -e ../..

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

@@ -26,7 +26,7 @@ dependencies:
   - isort
   - lxml=4.4  # Optional dep of pydap
   - matplotlib=3.1
-  - mypy=0.761  # Must match .pre-commit-config.yaml
+  - mypy=0.782  # Must match .pre-commit-config.yaml
   - nc-time-axis=1.2
   - netcdf4=1.4
   - numba=0.46

ci/requirements/py36.yml

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

ci/requirements/py37-windows.yml

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

ci/requirements/py37.yml

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

ci/requirements/py38-all-but-dask.yml

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

conftest.py

@@ -24,7 +24,7 @@ def pytest_runtest_setup(item):
 
 
 @pytest.fixture(autouse=True)
-def add_standard_imports(doctest_namespace):
+def add_standard_imports(doctest_namespace, tmpdir):
     import numpy as np
     import pandas as pd
 
@@ -33,3 +33,9 @@ def add_standard_imports(doctest_namespace):
     doctest_namespace["np"] = np
     doctest_namespace["pd"] = pd
     doctest_namespace["xr"] = xr
+
+    # always seed numpy.random to make the examples deterministic
+    np.random.seed(0)
+
+    # always switch to the temporary directory, so files get written there
+    tmpdir.chdir()

doc/api-hidden.rst

@@ -52,6 +52,7 @@
    core.rolling.DatasetCoarsen.var
    core.rolling.DatasetCoarsen.boundary
    core.rolling.DatasetCoarsen.coord_func
+   core.rolling.DatasetCoarsen.keep_attrs
    core.rolling.DatasetCoarsen.obj
    core.rolling.DatasetCoarsen.side
    core.rolling.DatasetCoarsen.trim_excess
@@ -104,6 +105,8 @@
    core.resample.DatasetResample.dims
    core.resample.DatasetResample.groups
 
+   core.rolling.DatasetRolling.argmax
+   core.rolling.DatasetRolling.argmin
    core.rolling.DatasetRolling.count
    core.rolling.DatasetRolling.max
    core.rolling.DatasetRolling.mean
@@ -115,11 +118,15 @@
    core.rolling.DatasetRolling.var
    core.rolling.DatasetRolling.center
    core.rolling.DatasetRolling.dim
+   core.rolling.DatasetRolling.keep_attrs
    core.rolling.DatasetRolling.min_periods
    core.rolling.DatasetRolling.obj
    core.rolling.DatasetRolling.rollings
    core.rolling.DatasetRolling.window
 
+   core.weighted.DatasetWeighted.obj
+   core.weighted.DatasetWeighted.weights
+
    core.rolling_exp.RollingExp.mean
 
    Dataset.argsort
@@ -188,6 +195,7 @@
    core.rolling.DataArrayCoarsen.var
    core.rolling.DataArrayCoarsen.boundary
    core.rolling.DataArrayCoarsen.coord_func
+   core.rolling.DataArrayCoarsen.keep_attrs
    core.rolling.DataArrayCoarsen.obj
    core.rolling.DataArrayCoarsen.side
    core.rolling.DataArrayCoarsen.trim_excess
@@ -238,6 +246,8 @@
    core.resample.DataArrayResample.dims
    core.resample.DataArrayResample.groups
 
+   core.rolling.DataArrayRolling.argmax
+   core.rolling.DataArrayRolling.argmin
    core.rolling.DataArrayRolling.count
    core.rolling.DataArrayRolling.max
    core.rolling.DataArrayRolling.mean
@@ -249,11 +259,15 @@
    core.rolling.DataArrayRolling.var
    core.rolling.DataArrayRolling.center
    core.rolling.DataArrayRolling.dim
+   core.rolling.DataArrayRolling.keep_attrs
    core.rolling.DataArrayRolling.min_periods
    core.rolling.DataArrayRolling.obj
    core.rolling.DataArrayRolling.window
    core.rolling.DataArrayRolling.window_labels
 
+   core.weighted.DataArrayWeighted.obj
+   core.weighted.DataArrayWeighted.weights
+
    DataArray.argsort
    DataArray.clip
    DataArray.conj
@@ -277,6 +291,13 @@
    core.accessor_dt.DatetimeAccessor.days_in_month
    core.accessor_dt.DatetimeAccessor.daysinmonth
    core.accessor_dt.DatetimeAccessor.hour
+   core.accessor_dt.DatetimeAccessor.is_leap_year
+   core.accessor_dt.DatetimeAccessor.is_month_end
+   core.accessor_dt.DatetimeAccessor.is_month_start
+   core.accessor_dt.DatetimeAccessor.is_quarter_end
+   core.accessor_dt.DatetimeAccessor.is_quarter_start
+   core.accessor_dt.DatetimeAccessor.is_year_end
+   core.accessor_dt.DatetimeAccessor.is_year_start
    core.accessor_dt.DatetimeAccessor.microsecond
    core.accessor_dt.DatetimeAccessor.minute
    core.accessor_dt.DatetimeAccessor.month
@@ -291,6 +312,14 @@
    core.accessor_dt.DatetimeAccessor.weekofyear
    core.accessor_dt.DatetimeAccessor.year
 
+   core.accessor_dt.TimedeltaAccessor.ceil
+   core.accessor_dt.TimedeltaAccessor.floor
+   core.accessor_dt.TimedeltaAccessor.round
+   core.accessor_dt.TimedeltaAccessor.days
+   core.accessor_dt.TimedeltaAccessor.microseconds
+   core.accessor_dt.TimedeltaAccessor.nanoseconds
+   core.accessor_dt.TimedeltaAccessor.seconds
+
    core.accessor_str.StringAccessor.capitalize
    core.accessor_str.StringAccessor.center
    core.accessor_str.StringAccessor.contains
@@ -365,6 +394,7 @@
    Variable.min
    Variable.no_conflicts
    Variable.notnull
+   Variable.pad
    Variable.prod
    Variable.quantile
    Variable.rank
@@ -407,6 +437,8 @@
 
    IndexVariable.all
    IndexVariable.any
+   IndexVariable.argmax
+   IndexVariable.argmin
    IndexVariable.argsort
    IndexVariable.astype
    IndexVariable.broadcast_equals
@@ -436,6 +468,7 @@
    IndexVariable.min
    IndexVariable.no_conflicts
    IndexVariable.notnull
+   IndexVariable.pad
    IndexVariable.prod
    IndexVariable.quantile
    IndexVariable.rank
@@ -538,6 +571,16 @@
    ufuncs.tanh
    ufuncs.trunc
 
+   plot.plot
+   plot.line
+   plot.step
+   plot.hist
+   plot.contour
+   plot.contourf
+   plot.imshow
+   plot.pcolormesh
+   plot.scatter
+
    plot.FacetGrid.map_dataarray
    plot.FacetGrid.set_titles
    plot.FacetGrid.set_ticks
@@ -547,11 +590,16 @@
    CFTimeIndex.any
    CFTimeIndex.append
    CFTimeIndex.argsort
+   CFTimeIndex.argmax
+   CFTimeIndex.argmin
    CFTimeIndex.asof
    CFTimeIndex.asof_locs
    CFTimeIndex.astype
+   CFTimeIndex.calendar
+   CFTimeIndex.ceil
    CFTimeIndex.contains
    CFTimeIndex.copy
+   CFTimeIndex.days_in_month
    CFTimeIndex.delete
    CFTimeIndex.difference
    CFTimeIndex.drop
@@ -562,6 +610,7 @@
    CFTimeIndex.equals
    CFTimeIndex.factorize
    CFTimeIndex.fillna
+   CFTimeIndex.floor
    CFTimeIndex.format
    CFTimeIndex.get_indexer
    CFTimeIndex.get_indexer_for
@@ -602,6 +651,7 @@
    CFTimeIndex.reindex
    CFTimeIndex.rename
    CFTimeIndex.repeat
+   CFTimeIndex.round
    CFTimeIndex.searchsorted
    CFTimeIndex.set_names
    CFTimeIndex.set_value
@@ -688,15 +738,20 @@
    backends.NetCDF4DataStore.is_remote
    backends.NetCDF4DataStore.lock
 
+   backends.H5NetCDFStore.autoclose
    backends.H5NetCDFStore.close
    backends.H5NetCDFStore.encode
    backends.H5NetCDFStore.encode_attribute
    backends.H5NetCDFStore.encode_variable
+   backends.H5NetCDFStore.format
    backends.H5NetCDFStore.get_attrs
    backends.H5NetCDFStore.get_dimensions
    backends.H5NetCDFStore.get_encoding
    backends.H5NetCDFStore.get_variables
+   backends.H5NetCDFStore.is_remote
    backends.H5NetCDFStore.load
+   backends.H5NetCDFStore.lock
+   backends.H5NetCDFStore.open
    backends.H5NetCDFStore.open_store_variable
    backends.H5NetCDFStore.prepare_variable
    backends.H5NetCDFStore.set_attribute

doc/combining.rst

@@ -244,16 +244,6 @@ in this manner.
 Combining along multiple dimensions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note::
-
-  There are currently three combining functions with similar names:
-  :py:func:`~xarray.auto_combine`, :py:func:`~xarray.combine_by_coords`, and
-  :py:func:`~xarray.combine_nested`. This is because
-  ``auto_combine`` is in the process of being deprecated in favour of the other
-  two functions, which are more general. If your code currently relies on
-  ``auto_combine``, then you will be able to get similar functionality by using
-  ``combine_nested``.
-
 For combining many objects along multiple dimensions xarray provides
 :py:func:`~xarray.combine_nested` and :py:func:`~xarray.combine_by_coords`. These
 functions use a combination of ``concat`` and ``merge`` across different