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:
  Run pyupgrade on core/groupby (pydata#6351)
  • Loading branch information
dcherian committed Mar 13, 2022
2 parents 26d85d5 + d535a3b commit 705b3f0
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions xarray/core/groupby.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from __future__ import annotations

import datetime
import warnings
from typing import Any, Callable, Hashable, Sequence, Union
from typing import Any, Callable, Hashable, Sequence

import numpy as np
import pandas as pd
Expand Down Expand Up @@ -982,9 +984,9 @@ def _combine(self, applied, shortcut=False):
def reduce(
self,
func: Callable[..., Any],
dim: Union[None, Hashable, Sequence[Hashable]] = None,
dim: None | Hashable | Sequence[Hashable] = None,
*,
axis: Union[None, int, Sequence[int]] = None,
axis: None | int | Sequence[int] = None,
keep_attrs: bool = None,
keepdims: bool = False,
shortcut: bool = True,
Expand Down Expand Up @@ -1110,9 +1112,9 @@ def _combine(self, applied):
def reduce(
self,
func: Callable[..., Any],
dim: Union[None, Hashable, Sequence[Hashable]] = None,
dim: None | Hashable | Sequence[Hashable] = None,
*,
axis: Union[None, int, Sequence[int]] = None,
axis: None | int | Sequence[int] = None,
keep_attrs: bool = None,
keepdims: bool = False,
**kwargs: Any,
Expand Down

0 comments on commit 705b3f0

Please sign in to comment.