Merge remote-tracking branch 'upstream/master' into map_blocks_2

* upstream/master:
  Remove setting of universal wheels (pydata#3367)
  Revisit # noqa annotations (pydata#3359)
  Fix codecov.io upload on Windows (pydata#3360)
  Add how do I ... section (pydata#3357)
  Add glossary to documentation (pydata#3352)
  Documentation improvements (pydata#3328)
  Remove `complex.nc` from built docs (pydata#3353)
  Fix DataArray.to_netcdf type annotation (pydata#3325)
  CI test suites with pinned minimum dependencies (pydata#3346)
  Bugfix/plot accept coord dim (pydata#3345)
  CI environments overhaul (pydata#3340)
  Add hypothesis support to related projects (pydata#3335)
  More doc fixes (pydata#3333)
  Improve the documentation of swap_dims (pydata#3331)
  fix the doc names of the return value of swap_dims (pydata#3329)

asv_bench/benchmarks/__init__.py

@@ -16,7 +16,7 @@ def decorator(func):
 
 def requires_dask():
     try:
-        import dask  # noqa
+        import dask  # noqa: F401
     except ImportError:
         raise NotImplementedError
 

asv_bench/benchmarks/dataarray_missing.py

@@ -5,7 +5,7 @@
 from . import randn, requires_dask
 
 try:
-    import dask  # noqa
+    import dask  # noqa: F401
 except ImportError:
     pass
 

azure-pipelines.yml

@@ -8,16 +8,20 @@ jobs:
 - job: Linux
   strategy:
     matrix:
-      py35-min:
-        conda_env: py35-min
+      py35-bare-minimum:
+        conda_env: py35-bare-minimum
+      py36-min-all-deps:
+        conda_env: py36-min-all-deps
+      py36-min-nep18:
+        conda_env: py36-min-nep18
       py36:
         conda_env: py36
       py37:
         conda_env: py37
       py37-upstream-dev:
         conda_env: py37
         upstream_dev: true
-      py36-flakey:
+      py36-flaky:
         conda_env: py36
         pytest_extra_flags: --run-flaky --run-network-tests
         allow_failure: true
@@ -90,15 +94,3 @@ jobs:
       cd doc
       sphinx-build -n -j auto -b html -d _build/doctrees . _build/html
     displayName: Build HTML docs
-
-- job: LinuxHypothesis
-  variables:
-    conda_env: py36-hypothesis
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: ci/azure/install.yml
-  - bash: |
-      source activate xarray-tests
-      pytest properties
-    displayName: Property based tests

ci/azure/unit-tests.yml

@@ -11,15 +11,16 @@ steps:
 # https://github.com/microsoft/azure-pipelines-tasks/issues/9302
 - bash: |
     source activate xarray-tests
-    pytest xarray \
+    pytest \
     --junitxml=junit/test-results.xml \
     --cov=xarray \
     --cov-report=xml \
     $(pytest_extra_flags) || [ "$ALLOW_FAILURE" = "true" ]
   displayName: Run tests
 
 - bash: |
-    bash <(curl https://codecov.io/bash) -t 688f4d53-31bb-49b5-8370-4ce6f792cf3d
+    curl https://codecov.io/bash > codecov.sh
+    bash codecov.sh -t 688f4d53-31bb-49b5-8370-4ce6f792cf3d
   displayName: Upload coverage to codecov.io
 
 # TODO: publish coverage results to Azure, once we can merge them across

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

@@ -0,0 +1,43 @@
+name: xarray-tests
+channels:
+  - conda-forge
+dependencies:
+  - python=3.6.7
+  - black
+  - boto3=1.9.235
+  - bottleneck=1.2.1
+  - cdms2=3.1.3
+  - cfgrib=0.9.7.2
+  - cftime=1.0.3.4
+  - coveralls
+  - dask=2.4.0
+  - distributed=2.4.0
+  - flake8
+  - h5netcdf=0.7.4
+  - h5py=2.10.0
+  - hdf5=1.10.5
+  - hypothesis
+  - iris=2.2.0
+  - lxml=4.4.1  # optional dep of pydap
+  - matplotlib=3.1.1
+  - mypy==0.720  # Must match .pre-commit-config.yaml
+  - nc-time-axis=1.2.0
+  - netcdf4=1.5.1.2
+  - numba=0.45.1
+  - numpy=1.17.2
+  - pandas=0.25.1
+  - pip
+  - pseudonetcdf=3.0.2
+  - pydap=3.2.2
+  - pynio=1.5.5
+  - pytest
+  - pytest-cov
+  - pytest-env
+  - rasterio=1.0.28
+  - scipy=1.3.1
+  - seaborn=0.9.0
+  # - sparse  # See py36-min-nep18.yml
+  - toolz=0.10.0
+  - zarr=2.3.2
+  - pip:
+    - numbagg==0.1

ci/requirements/py36-min-nep18.yml

@@ -0,0 +1,17 @@
+name: xarray-tests
+channels:
+  - conda-forge
+dependencies:
+  # Optional dependencies that require NEP18, such as sparse,
+  # require drastically newer packages than everything else
+  - python=3.6.7
+  - coveralls
+  - dask=2.4.0
+  - distributed=2.4.0
+  - numpy=1.17
+  - pandas=0.25
+  - pytest
+  - pytest-cov
+  - pytest-env
+  - scipy=1.3
+  - sparse=0.8.0

ci/requirements/py36.yml

@@ -3,36 +3,41 @@ channels:
   - conda-forge
 dependencies:
   - python=3.6
+  - black
+  - boto3
+  - bottleneck
+  - cdms2
+  - cfgrib>=0.9.2
   - cftime
+  - coveralls
   - dask
   - distributed
-  - h5py
+  - flake8
   - h5netcdf
+  - h5py
+  - hdf5
+  - hypothesis
+  - iris>=1.10
+  - lxml    # optional dep of pydap
   - matplotlib
-  - netcdf4
-  - pytest
-  - pytest-cov
-  - pytest-env
-  - coveralls
-  - flake8
   - mypy==0.720  # Must match .pre-commit-config.yaml
+  - nc-time-axis
+  - netcdf4
+  - numba
   - numpy>=1.12
   - pandas>=0.19
   - pip
+  - pseudonetcdf>=3.0.1
+  - pydap
+  - pynio
+  - pytest
+  - pytest-cov
+  - pytest-env
+  - rasterio
   - scipy
   - seaborn
+  - sparse
   - toolz
-  - rasterio
-  - boto3
-  - bottleneck
   - zarr
-  - pseudonetcdf>=3.0.1
-  - cfgrib>=0.9.2
-  - cdms2
-  # Disabled due to conflicting dependencies:
-  # https://github.com/pydata/xarray/issues/3154
-  # - pynio
-  - iris>=1.10
-  - pydap
-  - lxml
-
+  - pip:
+    - numbagg

ci/requirements/py37-windows.yml

@@ -3,24 +3,41 @@ channels:
   - conda-forge
 dependencies:
   - python=3.7
+  - black
+  - boto3
+  - bottleneck
+  # - cdms2  # Not available on Windows
+  # - cfgrib>=0.9.2  # Causes Python interpreter crash on Windows
   - cftime
-  - nc-time-axis
+  - coveralls
   - dask
   - distributed
-  - h5py
+  - flake8
   - h5netcdf
+  - h5py
+  - hdf5
+  - hypothesis
+  - iris>=1.10
+  - lxml    # optional dep of pydap
   - matplotlib
+  - mypy==0.720  # Must match .pre-commit-config.yaml
+  - nc-time-axis
   - netcdf4
-  - pytest
-  - pytest-cov
-  - pytest-env
-  - coveralls
+  - numba
   - numpy>=1.12
   - pandas>=0.19
   - pip
+  - pseudonetcdf>=3.0.1
+  - pydap
+  # - pynio  # Not available on Windows
+  - pytest
+  - pytest-cov
+  - pytest-env
+  - rasterio
   - scipy
   - seaborn
+  - sparse
   - toolz
-  - rasterio
-  - boto3
   - zarr
+  - pip:
+    - numbagg

ci/requirements/py37.yml

@@ -3,34 +3,41 @@ channels:
   - conda-forge
 dependencies:
   - python=3.7
+  - black
+  - boto3
+  - bottleneck
+  - cdms2
+  - cfgrib>=0.9.2
   - cftime
-  - nc-time-axis
+  - coveralls
   - dask
   - distributed
-  - h5py
+  - flake8
   - h5netcdf
+  - h5py
+  - hdf5
+  - hypothesis
+  - iris>=1.10
+  - lxml    # optional dep of pydap
   - matplotlib
-  - netcdf4
-  - pytest
-  - pytest-cov
-  - pytest-env
-  - coveralls
-  - flake8
   - mypy==0.720  # Must match .pre-commit-config.yaml
+  - nc-time-axis
+  - netcdf4
+  - numba
   - numpy>=1.12
   - pandas>=0.19
   - pip
+  - pseudonetcdf>=3.0.1
+  - pydap
+  - pynio
+  - pytest
+  - pytest-cov
+  - pytest-env
+  - rasterio
   - scipy
   - seaborn
   - sparse
   - toolz
-  - rasterio
-  - boto3
-  - bottleneck
   - zarr
-  - pseudonetcdf>=3.0.1
-  - cfgrib>=0.9.2
-  - lxml
-  - pydap
   - pip:
     - numbagg

doc/_static/style.css

@@ -16,3 +16,12 @@
 .wy-nav-top {
   background-color: #555;
 }
+
+table.colwidths-given {
+    table-layout: fixed;
+    width: 100%;
+}
+table.docutils td {
+    white-space: unset;
+    word-wrap: break-word;
+}

doc/api.rst

@@ -8,7 +8,7 @@ This page provides an auto-generated summary of xarray's API. For more details
 and examples, refer to the relevant chapters in the main part of the
 documentation.
 
-See also: :ref:`public api`_.
+See also: :ref:`public api`
 
 Top-level functions
 ===================

doc/examples/_code/weather_data_setup.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pandas as pd
-import seaborn as sns  # noqa, pandas aware plotting library
+import seaborn as sns
 
 import xarray as xr
 

doc/gallery/plot_cartopy_facetgrid.py

@@ -12,7 +12,7 @@
 For more details see `this discussion`_ on github.
 
 .. _this discussion: https://github.com/pydata/xarray/issues/1397#issuecomment-299190567
-"""  # noqa
+"""
 
 
 import cartopy.crs as ccrs