Merge branch 'main' into pr/5763

Author: Illviljan

.github/workflows/ci-additional.yaml

@@ -102,7 +102,7 @@ jobs:
              $PYTEST_EXTRA_FLAGS
 
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v2.0.3
+        uses: codecov/codecov-action@v2.1.0
         with:
           file: ./coverage.xml
           flags: unittests,${{ matrix.env }}

.github/workflows/ci.yaml

@@ -100,7 +100,7 @@ jobs:
           path: pytest.xml
 
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v2.0.3
+        uses: codecov/codecov-action@v2.1.0
         with:
           file: ./coverage.xml
           flags: unittests

.pre-commit-config.yaml

@@ -13,9 +13,10 @@ repos:
       - id: isort
   # https://github.com/python/black#version-control-integration
   - repo: https://github.com/psf/black
-    rev: 21.7b0
+    rev: 21.9b0
     hooks:
       - id: black
+      - id: black-jupyter
   - repo: https://github.com/keewis/blackdoc
     rev: v0.3.4
     hooks:
@@ -30,20 +31,21 @@ repos:
   #     - id: velin
   #       args: ["--write", "--compact"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910
+    rev: v0.910-1
     hooks:
       - id: mypy
-        # Copied from setup.cfg
-        exclude: "properties|asv_bench"
+        # `properies` & `asv_bench` are copied from setup.cfg.
+        # `_typed_ops.py` is added since otherwise mypy will complain (but notably only in pre-commit)
+        exclude: "properties|asv_bench|_typed_ops.py"
         additional_dependencies: [
             # Type stubs
             types-python-dateutil,
             types-pkg_resources,
             types-PyYAML,
             types-pytz,
+            typing-extensions==3.10.0.0,
             # Dependencies that are typed
             numpy,
-            typing-extensions==3.10.0.0,
           ]
   # run this occasionally, ref discussion https://github.com/pydata/xarray/pull/3194
   # - repo: https://github.com/asottile/pyupgrade

README.rst

@@ -105,7 +105,7 @@ to support our efforts.
 History
 -------
 
-xarray is an evolution of an internal tool developed at `The Climate
+Xarray is an evolution of an internal tool developed at `The Climate
 Corporation`__. It was originally written by Climate Corp researchers Stephan
 Hoyer, Alex Kleeman and Eugene Brevdo and was released as open source in
 May 2014. The project was renamed from "xray" in January 2016. Xarray became a
@@ -131,16 +131,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-xarray bundles portions of pandas, NumPy and Seaborn, all of which are available
+Xarray bundles portions of pandas, NumPy and Seaborn, all of which are available
 under a "3-clause BSD" license:
 - pandas: setup.py, xarray/util/print_versions.py
 - NumPy: xarray/core/npcompat.py
 - Seaborn: _determine_cmap_params in xarray/core/plot/utils.py
 
-xarray also bundles portions of CPython, which is available under the "Python
+Xarray also bundles portions of CPython, which is available under the "Python
 Software Foundation License" in xarray/core/pycompat.py.
 
-xarray uses icons from the icomoon package (free version), which is
+Xarray uses icons from the icomoon package (free version), which is
 available under the "CC BY 4.0" license.
 
 The full text of these licenses are included in the licenses directory.

asv_bench/benchmarks/groupby.py

@@ -0,0 +1,39 @@
+import numpy as np
+
+import xarray as xr
+
+from . import parameterized, requires_dask
+
+
+class GroupBy:
+    def setup(self, *args, **kwargs):
+        self.ds = xr.Dataset(
+            {
+                "a": xr.DataArray(np.r_[np.arange(500.0), np.arange(500.0)]),
+                "b": xr.DataArray(np.arange(1000.0)),
+            }
+        )
+
+    @parameterized(["method"], [("sum", "mean")])
+    def time_agg(self, method):
+        return getattr(self.ds.groupby("a"), method)()
+
+
+class GroupByDask(GroupBy):
+    def setup(self, *args, **kwargs):
+        requires_dask()
+        super().setup(**kwargs)
+        self.ds = self.ds.chunk({"dim_0": 50})
+
+
+class GroupByDataFrame(GroupBy):
+    def setup(self, *args, **kwargs):
+        super().setup(**kwargs)
+        self.ds = self.ds.to_dataframe()
+
+
+class GroupByDaskDataFrame(GroupBy):
+    def setup(self, *args, **kwargs):
+        requires_dask()
+        super().setup(**kwargs)
+        self.ds = self.ds.chunk({"dim_0": 50}).to_dataframe()

asv_bench/benchmarks/import_xarray.py

@@ -0,0 +1,9 @@
+class ImportXarray:
+    def setup(self, *args, **kwargs):
+        def import_xr():
+            import xarray  # noqa: F401
+
+        self._import_xr = import_xr
+
+    def time_import_xarray(self):
+        self._import_xr()

ci/requirements/doc.yml

@@ -23,6 +23,7 @@ dependencies:
   - pooch
   - pip
   - pydata-sphinx-theme>=0.4.3
+  - pyproj
   - rasterio>=1.1
   - seaborn
   - setuptools

doc/api.rst

@@ -35,6 +35,7 @@ Top-level functions
    map_blocks
    show_versions
    set_options
+   get_options
    unify_chunks
 
 Dataset
@@ -598,8 +599,8 @@ Universal functions
 
 .. warning::
 
-   With recent versions of numpy, dask and xarray, NumPy ufuncs are now
-   supported directly on all xarray and dask objects. This obviates the need
+   With recent versions of NumPy, Dask and xarray, NumPy ufuncs are now
+   supported directly on all xarray and Dask objects. This obviates the need
    for the ``xarray.ufuncs`` module, which should not be used for new code
    unless compatibility with versions of NumPy prior to v1.13 is
    required. They will be removed once support for NumPy prior to

doc/conf.py

@@ -260,8 +260,8 @@
 ogp_image = "https://xarray.pydata.org/en/stable/_static/dataset-diagram-logo.png"
 ogp_custom_meta_tags = [
     '<meta name="twitter:card" content="summary_large_image" />',
-    '<meta property="twitter:site" content="@xarray_dev />',
-    '<meta name="image" property="og:image" content="https://xarray.pydata.org/en/stable/_static/dataset-diagram-logo.png">',
+    '<meta property="twitter:site" content="@xarray_dev" />',
+    '<meta name="image" property="og:image" content="https://xarray.pydata.org/en/stable/_static/dataset-diagram-logo.png" />',
 ]
 
 # Redirects for pages that were moved to new locations

doc/contributing.rst

@@ -257,7 +257,7 @@ Some other important things to know about the docs:
   tutorial-like overviews per topic together with some other information
   (what's new, installation, etc).
 
-- The docstrings follow the **Numpy Docstring Standard**, which is used widely
+- The docstrings follow the **NumPy Docstring Standard**, which is used widely
   in the Scientific Python community. This standard specifies the format of
   the different sections of the docstring. See `this document
   <https://numpydoc.readthedocs.io/en/latest/format.html#docstring-standard>`_