Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
Browse files Browse the repository at this point in the history
…numpy-groupies

* upstream/main:
  Fixed a mispelling of dimension in dataarray documentation for from_dict (pydata#6020)
  [pre-commit.ci] pre-commit autoupdate (pydata#6014)
  [pre-commit.ci] pre-commit autoupdate (pydata#5990)
  Use set_options for asv bottleneck tests (pydata#5986)
  Fix module name retrieval in `backend.plugins.remove_duplicates()`, plugin tests (pydata#5959)
  • Loading branch information
dcherian committed Nov 26, 2021
2 parents 3c51b1a + 5db4046 commit 638d98a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
- id: isort
# https://github.com/python/black#version-control-integration
- repo: https://github.com/psf/black
rev: 21.10b0
rev: 21.11b1
hooks:
- id: black
- id: black-jupyter
Expand Down
2 changes: 1 addition & 1 deletion xarray/core/dataarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -2891,7 +2891,7 @@ def from_dict(cls, d: dict) -> "DataArray":
"name": "a",
}
where "t" is the name of the dimesion, "a" is the name of the array,
where "t" is the name of the dimension, "a" is the name of the array,
and x and t are lists, numpy.arrays, or pandas objects.
Parameters
Expand Down

0 comments on commit 638d98a

Please sign in to comment.