Skip to content

Commit ba37d63

Browse files
Merge remote-tracking branch 'upstream/main' into pandas.core.resample.Resampler.__iter__
2 parents e2616db + 68d9dca commit ba37d63

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

ci/code_checks.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
103103
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
104104
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
105105
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
106-
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
107106
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
108107
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
109108
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
@@ -112,7 +111,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
112111
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
113112
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
114113
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
115-
-i "pandas.core.groupby.SeriesGroupBy.ohlc SA01" \
116114
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
117115
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
118116
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
@@ -121,7 +119,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
121119
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
122120
-i "pandas.core.resample.Resampler.mean SA01" \
123121
-i "pandas.core.resample.Resampler.min PR01,RT03,SA01" \
124-
-i "pandas.core.resample.Resampler.ohlc SA01" \
125122
-i "pandas.core.resample.Resampler.prod SA01" \
126123
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
127124
-i "pandas.core.resample.Resampler.sem SA01" \

pandas/core/groupby/groupby.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3238,6 +3238,12 @@ def ohlc(self) -> DataFrame:
32383238
DataFrame
32393239
Open, high, low and close values within each group.
32403240
3241+
See Also
3242+
--------
3243+
DataFrame.agg : Aggregate using one or more operations over the specified axis.
3244+
DataFrame.resample : Resample time-series data.
3245+
DataFrame.groupby : Group DataFrame using a mapper or by a Series of columns.
3246+
32413247
Examples
32423248
--------
32433249

0 commit comments

Comments
 (0)