Skip to content

Commit

Permalink
Merge branch 'main' into groupby-aggs-using-numpy-groupies
Browse files Browse the repository at this point in the history
* main:
  Generate reductions for DataArray, Dataset, GroupBy and Resample (pydata#5950)
  explicitly install `ipython_genutils` (pydata#6350)
  • Loading branch information
dcherian committed Mar 13, 2022
2 parents 62474a8 + 229dad9 commit 94bcb32
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions ci/requirements/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- h5netcdf>=0.7.4
- ipykernel
- ipython
- ipython_genutils # remove once `nbconvert` fixed its dependencies
- iris>=2.3
- jupyter_client
- matplotlib-base
Expand Down
1 change: 0 additions & 1 deletion xarray/tests/test_duck_array_ops.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import datetime as dt
import warnings
from textwrap import dedent

import numpy as np
import pandas as pd
Expand Down
3 changes: 0 additions & 3 deletions xarray/util/generate_reductions.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def reduce(
) -> "{obj}":
raise NotImplementedError()"""


GROUPBY_PREAMBLE = """
class {obj}{cls}Reductions:
Expand All @@ -78,7 +77,6 @@ def _flox_reduce(
) -> "{obj}":
raise NotImplementedError()"""


TEMPLATE_REDUCTION_SIGNATURE = '''
def {method}(
self,
Expand Down Expand Up @@ -395,7 +393,6 @@ class DataStructure:
example_var_name="ds",
numeric_only=True,
)

DATAARRAY_OBJECT = DataStructure(
name="DataArray",
docstring_create="""
Expand Down

0 comments on commit 94bcb32

Please sign in to comment.