Skip to content

Commit 638d98a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-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)
2 parents 3c51b1a + 5db4046 commit 638d98a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: isort
1414
# https://github.com/python/black#version-control-integration
1515
- repo: https://github.com/psf/black
16-
rev: 21.10b0
16+
rev: 21.11b1
1717
hooks:
1818
- id: black
1919
- id: black-jupyter

xarray/core/dataarray.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2891,7 +2891,7 @@ def from_dict(cls, d: dict) -> "DataArray":
28912891
"name": "a",
28922892
}
28932893
2894-
where "t" is the name of the dimesion, "a" is the name of the array,
2894+
where "t" is the name of the dimension, "a" is the name of the array,
28952895
and x and t are lists, numpy.arrays, or pandas objects.
28962896
28972897
Parameters

0 commit comments

Comments
 (0)