Skip to content

Commit 599b779

Browse files
authored
Grouper refactor (#9122)
* Move Groupers out to groupers.py * cleanup * missed one.
1 parent 1265310 commit 599b779

File tree

7 files changed

+423
-381
lines changed

7 files changed

+423
-381
lines changed

xarray/core/common.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,8 @@ def _resample(
10671067
# TODO support non-string indexer after removing the old API.
10681068

10691069
from xarray.core.dataarray import DataArray
1070-
from xarray.core.groupby import ResolvedGrouper, TimeResampler
1070+
from xarray.core.groupby import ResolvedGrouper
1071+
from xarray.core.groupers import TimeResampler
10711072
from xarray.core.resample import RESAMPLE_DIM
10721073

10731074
# note: the second argument (now 'skipna') use to be 'dim'

xarray/core/dataarray.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6751,9 +6751,9 @@ def groupby(
67516751
from xarray.core.groupby import (
67526752
DataArrayGroupBy,
67536753
ResolvedGrouper,
6754-
UniqueGrouper,
67556754
_validate_groupby_squeeze,
67566755
)
6756+
from xarray.core.groupers import UniqueGrouper
67576757

67586758
_validate_groupby_squeeze(squeeze)
67596759
rgrouper = ResolvedGrouper(UniqueGrouper(), group, self)
@@ -6833,11 +6833,11 @@ def groupby_bins(
68336833
.. [1] http://pandas.pydata.org/pandas-docs/stable/generated/pandas.cut.html
68346834
"""
68356835
from xarray.core.groupby import (
6836-
BinGrouper,
68376836
DataArrayGroupBy,
68386837
ResolvedGrouper,
68396838
_validate_groupby_squeeze,
68406839
)
6840+
from xarray.core.groupers import BinGrouper
68416841

68426842
_validate_groupby_squeeze(squeeze)
68436843
grouper = BinGrouper(

xarray/core/dataset.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10301,9 +10301,9 @@ def groupby(
1030110301
from xarray.core.groupby import (
1030210302
DatasetGroupBy,
1030310303
ResolvedGrouper,
10304-
UniqueGrouper,
1030510304
_validate_groupby_squeeze,
1030610305
)
10306+
from xarray.core.groupers import UniqueGrouper
1030710307

1030810308
_validate_groupby_squeeze(squeeze)
1030910309
rgrouper = ResolvedGrouper(UniqueGrouper(), group, self)
@@ -10384,11 +10384,11 @@ def groupby_bins(
1038410384
.. [1] http://pandas.pydata.org/pandas-docs/stable/generated/pandas.cut.html
1038510385
"""
1038610386
from xarray.core.groupby import (
10387-
BinGrouper,
1038810387
DatasetGroupBy,
1038910388
ResolvedGrouper,
1039010389
_validate_groupby_squeeze,
1039110390
)
10391+
from xarray.core.groupers import BinGrouper
1039210392

1039310393
_validate_groupby_squeeze(squeeze)
1039410394
grouper = BinGrouper(

0 commit comments

Comments
 (0)