Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…

…numpy-groupies

* upstream/main:
  Replace markdown issue templates with issue forms (pydata#6119)
  Remove lock kwarg (pydata#5912)
  Remove pre-commit GHA workflow (pydata#6120)
  is_dask_collection: micro optimization (pydata#6107)
  Revert "Single matplotlib import (pydata#5794)" (pydata#6064)
  Add support for cross product (pydata#5365)
  assert ds errors in test_backends (pydata#6122)
  assert ds errors in test_dataset.py (pydata#6123)

.github/ISSUE_TEMPLATE/bugreport.yml

@@ -0,0 +1,61 @@
+name: Bug Report
+description: File a bug report to help us improve
+title: '[Bug]: '
+labels: [bug, 'needs triage']
+assignees: []
+body:
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: |
+        Thanks for reporting a bug! Please describe what you were trying to get done.
+        Tell us what happened, what went wrong.
+    validations:
+      required: true
+
+  - type: textarea
+    id: what-did-you-expect-to-happen
+    attributes:
+      label: What did you expect to happen?
+      description: |
+        Describe what you expected to happen.
+    validations:
+      required: false
+
+  - type: textarea
+    id: sample-code
+    attributes:
+      label: Minimal Complete Verifiable Example
+      description: |
+        Minimal, self-contained copy-pastable example that generates the issue if possible. Please be concise with code posted. See guidelines below on how to provide a good bug report:
+
+        - [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
+        - [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
+
+        Bug reports that follow these guidelines are easier to diagnose, and so are often handled much more quickly.
+        This will be automatically formatted into code, so no need for markdown backticks.
+      render: python
+
+  - type: textarea
+    id: log-output
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for markdown backticks.
+      render: python
+
+  - type: textarea
+    id: extra
+    attributes:
+      label: Anything else we need to know?
+      description: |
+        Please describe any other information you want to share.
+
+  - type: textarea
+    id: show-versions
+    attributes:
+     label: Environment
+     description: |
+       Paste the output of `xr.show_versions()` here
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/newfeature.yml

@@ -0,0 +1,37 @@
+name: Feature Request
+description: Suggest an idea for xarray
+title: '[FEATURE]: '
+labels: [enhancement]
+assignees: []
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Is your feature request related to a problem?
+      description: |
+        Please do a quick search of existing issues to make sure that this has not been asked before.
+        Please provide a clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+        A clear and concise description of what you want to happen.
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context about the feature request here.
+    validations:
+      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,5 @@
 
 - [ ] Closes #xxxx
 - [ ] Tests added
-- [ ] Passes `pre-commit run --all-files`
 - [ ] User visible changes (including notable bug fixes) are documented in `whats-new.rst`
 - [ ] New functions/methods are listed in `api.rst`

doc/api.rst

@@ -32,6 +32,7 @@ Top-level functions
    ones_like
    cov
    corr
+   cross
    dot
    polyval
    map_blocks

doc/whats-new.rst

@@ -21,6 +21,8 @@ v0.21.0 (unreleased)
 
 New Features
 ~~~~~~~~~~~~
+- New top-level function :py:func:`cross`. (:issue:`3279`, :pull:`5365`).
+  By `Jimmy Westling <https://github.com/illviljan>`_.
 
 
 Breaking changes
@@ -29,6 +31,8 @@ Breaking changes
 
 Deprecations
 ~~~~~~~~~~~~
+- Removed the lock kwarg from the zarr and pydap backends, completing the deprecation cycle started in :issue:`5256`.
+  By `Tom Nicholas <https://github.com/TomNicholas>`_.
 
 
 Bug fixes

xarray/__init__.py

@@ -16,7 +16,16 @@
 from .core.alignment import align, broadcast
 from .core.combine import combine_by_coords, combine_nested
 from .core.common import ALL_DIMS, full_like, ones_like, zeros_like
-from .core.computation import apply_ufunc, corr, cov, dot, polyval, unify_chunks, where
+from .core.computation import (
+    apply_ufunc,
+    corr,
+    cov,
+    cross,
+    dot,
+    polyval,
+    unify_chunks,
+    where,
+)
 from .core.concat import concat
 from .core.dataarray import DataArray
 from .core.dataset import Dataset
@@ -60,6 +69,7 @@
     "dot",
     "cov",
     "corr",
+    "cross",
     "full_like",
     "get_options",
     "infer_freq",

xarray/backends/pydap_.py

@@ -1,5 +1,3 @@
-import warnings
-
 import numpy as np
 
 from ..core import indexing
@@ -126,15 +124,7 @@ def open_dataset(
         use_cftime=None,
         decode_timedelta=None,
         session=None,
-        lock=None,
     ):
-        # TODO remove after v0.19
-        if lock is not None:
-            warnings.warn(
-                "The kwarg 'lock' has been deprecated for this backend, and is now "
-                "ignored. In the future passing lock will raise an error.",
-                DeprecationWarning,
-            )
 
         store = PydapDataStore.open(
             filename_or_obj,

xarray/backends/zarr.py

@@ -810,15 +810,7 @@ def open_dataset(
         chunk_store=None,
         storage_options=None,
         stacklevel=3,
-        lock=None,
     ):
-        # TODO remove after v0.19
-        if lock is not None:
-            warnings.warn(
-                "The kwarg 'lock' has been deprecated for this backend, and is now "
-                "ignored. In the future passing lock will raise an error.",
-                DeprecationWarning,
-            )
 
         filename_or_obj = _normalize_path(filename_or_obj)
         store = ZarrStore.open_group(