Skip to content

Commit 94bcb32

Browse files
committed
Merge branch 'main' into groupby-aggs-using-numpy-groupies
* main: Generate reductions for DataArray, Dataset, GroupBy and Resample (pydata#5950) explicitly install `ipython_genutils` (pydata#6350)
2 parents 62474a8 + 229dad9 commit 94bcb32

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

ci/requirements/doc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies:
1212
- h5netcdf>=0.7.4
1313
- ipykernel
1414
- ipython
15+
- ipython_genutils # remove once `nbconvert` fixed its dependencies
1516
- iris>=2.3
1617
- jupyter_client
1718
- matplotlib-base

xarray/tests/test_duck_array_ops.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import datetime as dt
22
import warnings
3-
from textwrap import dedent
43

54
import numpy as np
65
import pandas as pd

xarray/util/generate_reductions.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def reduce(
5353
) -> "{obj}":
5454
raise NotImplementedError()"""
5555

56-
5756
GROUPBY_PREAMBLE = """
5857
5958
class {obj}{cls}Reductions:
@@ -78,7 +77,6 @@ def _flox_reduce(
7877
) -> "{obj}":
7978
raise NotImplementedError()"""
8079

81-
8280
TEMPLATE_REDUCTION_SIGNATURE = '''
8381
def {method}(
8482
self,
@@ -395,7 +393,6 @@ class DataStructure:
395393
example_var_name="ds",
396394
numeric_only=True,
397395
)
398-
399396
DATAARRAY_OBJECT = DataStructure(
400397
name="DataArray",
401398
docstring_create="""

0 commit comments

Comments
 (0)