Skip to content

Commit 3db6666

Browse files
dilex42rhshadrach
dilex42
authored andcommitted
DOC/CLN: Clean/Fix documentation for Window module (pandas-dev#33608)
* Clean/Fix documentation for Window module * add pandas prefix * remove SA05 check from ci
1 parent 33eeaa7 commit 3db6666

File tree

5 files changed

+63
-60
lines changed

5 files changed

+63
-60
lines changed

ci/code_checks.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ fi
353353
### DOCSTRINGS ###
354354
if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
355355

356-
MSG='Validate docstrings (GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS04, SS05, PR03, PR04, PR05, PR10, EX04, RT01, RT04, RT05, SA02, SA03, SA05)' ; echo $MSG
357-
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS04,SS05,PR03,PR04,PR05,PR10,EX04,RT01,RT04,RT05,SA02,SA03,SA05
356+
MSG='Validate docstrings (GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS04, SS05, PR03, PR04, PR05, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG
357+
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS04,SS05,PR03,PR04,PR05,PR10,EX04,RT01,RT04,RT05,SA02,SA03
358358
RET=$(($RET + $?)) ; echo $MSG "DONE"
359359

360360
MSG='Validate correct capitalization among titles in documentation' ; echo $MSG

pandas/core/window/common.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
2323
See Also
2424
--------
25-
Series.%(name)s : Series %(name)s.
26-
DataFrame.%(name)s : DataFrame %(name)s.
25+
pandas.Series.%(name)s : Calling object with Series data.
26+
pandas.DataFrame.%(name)s : Calling object with DataFrame data.
27+
pandas.Series.%(func_name)s : Similar method for Series.
28+
pandas.DataFrame.%(func_name)s : Similar method for DataFrame.
2729
"""
2830

2931

pandas/core/window/ewm.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def func(arg):
250250

251251
return self._wrap_results(results, block_list, obj, exclude)
252252

253-
@Substitution(name="ewm")
253+
@Substitution(name="ewm", func_name="mean")
254254
@Appender(_doc_template)
255255
def mean(self, *args, **kwargs):
256256
"""
@@ -264,7 +264,7 @@ def mean(self, *args, **kwargs):
264264
nv.validate_window_func("mean", args, kwargs)
265265
return self._apply("ewma", **kwargs)
266266

267-
@Substitution(name="ewm")
267+
@Substitution(name="ewm", func_name="std")
268268
@Appender(_doc_template)
269269
@Appender(_bias_template)
270270
def std(self, bias=False, *args, **kwargs):
@@ -276,7 +276,7 @@ def std(self, bias=False, *args, **kwargs):
276276

277277
vol = std
278278

279-
@Substitution(name="ewm")
279+
@Substitution(name="ewm", func_name="var")
280280
@Appender(_doc_template)
281281
@Appender(_bias_template)
282282
def var(self, bias=False, *args, **kwargs):
@@ -298,7 +298,7 @@ def f(arg):
298298

299299
return self._apply(f, **kwargs)
300300

301-
@Substitution(name="ewm")
301+
@Substitution(name="ewm", func_name="cov")
302302
@Appender(_doc_template)
303303
def cov(self, other=None, pairwise=None, bias=False, **kwargs):
304304
"""
@@ -345,7 +345,7 @@ def _get_cov(X, Y):
345345
self._selected_obj, other._selected_obj, _get_cov, pairwise=bool(pairwise)
346346
)
347347

348-
@Substitution(name="ewm")
348+
@Substitution(name="ewm", func_name="corr")
349349
@Appender(_doc_template)
350350
def corr(self, other=None, pairwise=None, **kwargs):
351351
"""

pandas/core/window/expanding.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@ def _get_window(self, other=None, **kwargs):
8989
"""
9090
See Also
9191
--------
92-
DataFrame.expanding.aggregate
93-
DataFrame.rolling.aggregate
94-
DataFrame.aggregate
92+
pandas.DataFrame.aggregate : Similar DataFrame method.
93+
pandas.Series.aggregate : Similar Series method.
9594
"""
9695
)
9796

@@ -158,7 +157,7 @@ def sum(self, *args, **kwargs):
158157
nv.validate_expanding_func("sum", args, kwargs)
159158
return super().sum(*args, **kwargs)
160159

161-
@Substitution(name="expanding")
160+
@Substitution(name="expanding", func_name="max")
162161
@Appender(_doc_template)
163162
@Appender(_shared_docs["max"])
164163
def max(self, *args, **kwargs):
@@ -194,7 +193,7 @@ def var(self, ddof=1, *args, **kwargs):
194193
nv.validate_expanding_func("var", args, kwargs)
195194
return super().var(ddof=ddof, **kwargs)
196195

197-
@Substitution(name="expanding")
196+
@Substitution(name="expanding", func_name="skew")
198197
@Appender(_doc_template)
199198
@Appender(_shared_docs["skew"])
200199
def skew(self, **kwargs):
@@ -238,7 +237,7 @@ def quantile(self, quantile, interpolation="linear", **kwargs):
238237
quantile=quantile, interpolation=interpolation, **kwargs
239238
)
240239

241-
@Substitution(name="expanding")
240+
@Substitution(name="expanding", func_name="cov")
242241
@Appender(_doc_template)
243242
@Appender(_shared_docs["cov"])
244243
def cov(self, other=None, pairwise=None, ddof=1, **kwargs):

pandas/core/window/rolling.py

+47-45
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,8 @@ def aggregate(self, func, *args, **kwargs):
540540
541541
See Also
542542
--------
543-
Series.sum : Reducing sum for Series.
544-
DataFrame.sum : Reducing sum for DataFrame.
543+
pandas.Series.sum : Reducing sum for Series.
544+
pandas.DataFrame.sum : Reducing sum for DataFrame.
545545
546546
Examples
547547
--------
@@ -618,10 +618,10 @@ def aggregate(self, func, *args, **kwargs):
618618
619619
See Also
620620
--------
621-
Series.%(name)s : Calling object with Series data.
622-
DataFrame.%(name)s : Calling object with DataFrames.
623-
Series.mean : Equivalent method for Series.
624-
DataFrame.mean : Equivalent method for DataFrame.
621+
pandas.Series.%(name)s : Calling object with Series data.
622+
pandas.DataFrame.%(name)s : Calling object with DataFrames.
623+
pandas.Series.mean : Equivalent method for Series.
624+
pandas.DataFrame.mean : Equivalent method for DataFrame.
625625
626626
Examples
627627
--------
@@ -667,10 +667,10 @@ def aggregate(self, func, *args, **kwargs):
667667
668668
See Also
669669
--------
670-
Series.%(name)s : Calling object with Series data.
671-
DataFrame.%(name)s : Calling object with DataFrames.
672-
Series.var : Equivalent method for Series.
673-
DataFrame.var : Equivalent method for DataFrame.
670+
pandas.Series.%(name)s : Calling object with Series data.
671+
pandas.DataFrame.%(name)s : Calling object with DataFrames.
672+
pandas.Series.var : Equivalent method for Series.
673+
pandas.DataFrame.var : Equivalent method for DataFrame.
674674
numpy.var : Equivalent method for Numpy array.
675675
676676
Notes
@@ -727,10 +727,10 @@ def aggregate(self, func, *args, **kwargs):
727727
728728
See Also
729729
--------
730-
Series.%(name)s : Calling object with Series data.
731-
DataFrame.%(name)s : Calling object with DataFrames.
732-
Series.std : Equivalent method for Series.
733-
DataFrame.std : Equivalent method for DataFrame.
730+
pandas.Series.%(name)s : Calling object with Series data.
731+
pandas.DataFrame.%(name)s : Calling object with DataFrames.
732+
pandas.Series.std : Equivalent method for Series.
733+
pandas.DataFrame.std : Equivalent method for DataFrame.
734734
numpy.std : Equivalent method for Numpy array.
735735
736736
Notes
@@ -1041,8 +1041,8 @@ def _get_window(
10411041
"""
10421042
See Also
10431043
--------
1044-
pandas.DataFrame.rolling.aggregate
1045-
pandas.DataFrame.aggregate
1044+
pandas.DataFrame.aggregate : Similar DataFrame method.
1045+
pandas.Series.aggregate : Similar Series method.
10461046
"""
10471047
)
10481048

@@ -1142,9 +1142,9 @@ class _Rolling_and_Expanding(_Rolling):
11421142
11431143
See Also
11441144
--------
1145-
Series.%(name)s : Calling object with Series data.
1146-
DataFrame.%(name)s : Calling object with DataFrames.
1147-
DataFrame.count : Count of the full DataFrame.
1145+
pandas.Series.%(name)s : Calling object with Series data.
1146+
pandas.DataFrame.%(name)s : Calling object with DataFrames.
1147+
pandas.DataFrame.count : Count of the full DataFrame.
11481148
11491149
Examples
11501150
--------
@@ -1240,8 +1240,10 @@ def count(self):
12401240
12411241
See Also
12421242
--------
1243-
Series.%(name)s : Series %(name)s.
1244-
DataFrame.%(name)s : DataFrame %(name)s.
1243+
pandas.Series.%(name)s : Calling object with Series data.
1244+
pandas.DataFrame.%(name)s : Calling object with DataFrame data.
1245+
pandas.Series.apply : Similar method for Series.
1246+
pandas.DataFrame.apply : Similar method for DataFrame.
12451247
12461248
Notes
12471249
-----
@@ -1362,10 +1364,10 @@ def max(self, *args, **kwargs):
13621364
13631365
See Also
13641366
--------
1365-
Series.%(name)s : Calling object with a Series.
1366-
DataFrame.%(name)s : Calling object with a DataFrame.
1367-
Series.min : Similar method for Series.
1368-
DataFrame.min : Similar method for DataFrame.
1367+
pandas.Series.%(name)s : Calling object with a Series.
1368+
pandas.DataFrame.%(name)s : Calling object with a DataFrame.
1369+
pandas.Series.min : Similar method for Series.
1370+
pandas.DataFrame.min : Similar method for DataFrame.
13691371
13701372
Examples
13711373
--------
@@ -1409,10 +1411,10 @@ def mean(self, *args, **kwargs):
14091411
14101412
See Also
14111413
--------
1412-
Series.%(name)s : Calling object with Series data.
1413-
DataFrame.%(name)s : Calling object with DataFrames.
1414-
Series.median : Equivalent method for Series.
1415-
DataFrame.median : Equivalent method for DataFrame.
1414+
pandas.Series.%(name)s : Calling object with Series data.
1415+
pandas.DataFrame.%(name)s : Calling object with DataFrames.
1416+
pandas.Series.median : Equivalent method for Series.
1417+
pandas.DataFrame.median : Equivalent method for DataFrame.
14161418
14171419
Examples
14181420
--------
@@ -1508,10 +1510,10 @@ def skew(self, **kwargs):
15081510
15091511
See Also
15101512
--------
1511-
Series.%(name)s : Calling object with Series data.
1512-
DataFrame.%(name)s : Calling object with DataFrames.
1513-
Series.kurt : Equivalent method for Series.
1514-
DataFrame.kurt : Equivalent method for DataFrame.
1513+
pandas.Series.%(name)s : Calling object with Series data.
1514+
pandas.DataFrame.%(name)s : Calling object with DataFrames.
1515+
pandas.Series.kurt : Equivalent method for Series.
1516+
pandas.DataFrame.kurt : Equivalent method for DataFrame.
15151517
scipy.stats.skew : Third moment of a probability density.
15161518
scipy.stats.kurtosis : Reference SciPy method.
15171519
@@ -1564,9 +1566,9 @@ def kurt(self, **kwargs):
15641566
15651567
See Also
15661568
--------
1567-
Series.quantile : Computes value at the given quantile over all data
1569+
pandas.Series.quantile : Computes value at the given quantile over all data
15681570
in Series.
1569-
DataFrame.quantile : Computes values at the given quantile over
1571+
pandas.DataFrame.quantile : Computes values at the given quantile over
15701572
requested axis in DataFrame.
15711573
15721574
Examples
@@ -1693,11 +1695,11 @@ def _get_cov(X, Y):
16931695
16941696
See Also
16951697
--------
1696-
Series.%(name)s : Calling object with Series data.
1697-
DataFrame.%(name)s : Calling object with DataFrames.
1698-
Series.corr : Equivalent method for Series.
1699-
DataFrame.corr : Equivalent method for DataFrame.
1700-
%(name)s.cov : Similar method to calculate covariance.
1698+
pandas.Series.%(name)s : Calling object with Series data.
1699+
pandas.DataFrame.%(name)s : Calling object with DataFrames.
1700+
pandas.Series.corr : Equivalent method for Series.
1701+
pandas.DataFrame.corr : Equivalent method for DataFrame.
1702+
cov : Similar method to calculate covariance.
17011703
numpy.corrcoef : NumPy Pearson's correlation calculation.
17021704
17031705
Notes
@@ -1902,8 +1904,8 @@ def _validate_freq(self):
19021904
"""
19031905
See Also
19041906
--------
1905-
Series.rolling
1906-
DataFrame.rolling
1907+
pandas.Series.rolling : Calling object with Series data.
1908+
pandas.DataFrame.rolling : Calling object with DataFrame data.
19071909
"""
19081910
)
19091911

@@ -1984,7 +1986,7 @@ def sum(self, *args, **kwargs):
19841986
nv.validate_rolling_func("sum", args, kwargs)
19851987
return super().sum(*args, **kwargs)
19861988

1987-
@Substitution(name="rolling")
1989+
@Substitution(name="rolling", func_name="max")
19881990
@Appender(_doc_template)
19891991
@Appender(_shared_docs["max"])
19901992
def max(self, *args, **kwargs):
@@ -2020,7 +2022,7 @@ def var(self, ddof=1, *args, **kwargs):
20202022
nv.validate_rolling_func("var", args, kwargs)
20212023
return super().var(ddof=ddof, **kwargs)
20222024

2023-
@Substitution(name="rolling")
2025+
@Substitution(name="rolling", func_name="skew")
20242026
@Appender(_doc_template)
20252027
@Appender(_shared_docs["skew"])
20262028
def skew(self, **kwargs):
@@ -2064,7 +2066,7 @@ def quantile(self, quantile, interpolation="linear", **kwargs):
20642066
quantile=quantile, interpolation=interpolation, **kwargs
20652067
)
20662068

2067-
@Substitution(name="rolling")
2069+
@Substitution(name="rolling", func_name="cov")
20682070
@Appender(_doc_template)
20692071
@Appender(_shared_docs["cov"])
20702072
def cov(self, other=None, pairwise=None, ddof=1, **kwargs):

0 commit comments

Comments
 (0)