Skip to content

Commit 63bfdf5

Browse files
authored
TYP: Window code (#40293)
* TYPE: Window code * type apply and constrcutor
1 parent aac91f1 commit 63bfdf5

File tree

3 files changed

+162
-33
lines changed

3 files changed

+162
-33
lines changed

pandas/core/window/ewm.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from pandas._libs.tslibs import Timedelta
1515
import pandas._libs.window.aggregations as window_aggregations
1616
from pandas._typing import (
17+
Axis,
1718
FrameOrSeries,
1819
FrameOrSeriesUnion,
1920
TimedeltaConvertibleTypes,
@@ -227,15 +228,15 @@ class ExponentialMovingWindow(BaseWindow):
227228

228229
def __init__(
229230
self,
230-
obj,
231+
obj: FrameOrSeries,
231232
com: Optional[float] = None,
232233
span: Optional[float] = None,
233234
halflife: Optional[Union[float, TimedeltaConvertibleTypes]] = None,
234235
alpha: Optional[float] = None,
235236
min_periods: int = 0,
236237
adjust: bool = True,
237238
ignore_na: bool = False,
238-
axis: int = 0,
239+
axis: Axis = 0,
239240
times: Optional[Union[str, np.ndarray, FrameOrSeries]] = None,
240241
):
241242
super().__init__(

pandas/core/window/expanding.py

+51-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010

1111
import numpy as np
1212

13-
from pandas._typing import FrameOrSeries
13+
from pandas._typing import (
14+
Axis,
15+
FrameOrSeries,
16+
FrameOrSeriesUnion,
17+
)
1418
from pandas.compat.numpy import function as nv
1519
from pandas.util._decorators import doc
1620

@@ -94,7 +98,14 @@ class Expanding(RollingAndExpandingMixin):
9498

9599
_attributes = ["min_periods", "center", "axis", "method"]
96100

97-
def __init__(self, obj, min_periods=1, center=None, axis=0, method="single"):
101+
def __init__(
102+
self,
103+
obj: FrameOrSeries,
104+
min_periods: int = 1,
105+
center=None,
106+
axis: Axis = 0,
107+
method: str = "single",
108+
):
98109
super().__init__(
99110
obj=obj, min_periods=min_periods, center=center, axis=axis, method=method
100111
)
@@ -200,7 +211,13 @@ def apply(
200211
aggregation_description="sum",
201212
agg_method="sum",
202213
)
203-
def sum(self, *args, engine=None, engine_kwargs=None, **kwargs):
214+
def sum(
215+
self,
216+
*args,
217+
engine: Optional[str] = None,
218+
engine_kwargs: Optional[Dict[str, bool]] = None,
219+
**kwargs,
220+
):
204221
nv.validate_expanding_func("sum", args, kwargs)
205222
return super().sum(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)
206223

@@ -220,7 +237,13 @@ def sum(self, *args, engine=None, engine_kwargs=None, **kwargs):
220237
aggregation_description="maximum",
221238
agg_method="max",
222239
)
223-
def max(self, *args, engine=None, engine_kwargs=None, **kwargs):
240+
def max(
241+
self,
242+
*args,
243+
engine: Optional[str] = None,
244+
engine_kwargs: Optional[Dict[str, bool]] = None,
245+
**kwargs,
246+
):
224247
nv.validate_expanding_func("max", args, kwargs)
225248
return super().max(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)
226249

@@ -240,7 +263,13 @@ def max(self, *args, engine=None, engine_kwargs=None, **kwargs):
240263
aggregation_description="minimum",
241264
agg_method="min",
242265
)
243-
def min(self, *args, engine=None, engine_kwargs=None, **kwargs):
266+
def min(
267+
self,
268+
*args,
269+
engine: Optional[str] = None,
270+
engine_kwargs: Optional[Dict[str, bool]] = None,
271+
**kwargs,
272+
):
244273
nv.validate_expanding_func("min", args, kwargs)
245274
return super().min(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)
246275

@@ -260,7 +289,13 @@ def min(self, *args, engine=None, engine_kwargs=None, **kwargs):
260289
aggregation_description="mean",
261290
agg_method="mean",
262291
)
263-
def mean(self, *args, engine=None, engine_kwargs=None, **kwargs):
292+
def mean(
293+
self,
294+
*args,
295+
engine: Optional[str] = None,
296+
engine_kwargs: Optional[Dict[str, bool]] = None,
297+
**kwargs,
298+
):
264299
nv.validate_expanding_func("mean", args, kwargs)
265300
return super().mean(*args, engine=engine, engine_kwargs=engine_kwargs, **kwargs)
266301

@@ -279,7 +314,12 @@ def mean(self, *args, engine=None, engine_kwargs=None, **kwargs):
279314
aggregation_description="median",
280315
agg_method="median",
281316
)
282-
def median(self, engine=None, engine_kwargs=None, **kwargs):
317+
def median(
318+
self,
319+
engine: Optional[str] = None,
320+
engine_kwargs: Optional[Dict[str, bool]] = None,
321+
**kwargs,
322+
):
283323
return super().median(engine=engine, engine_kwargs=engine_kwargs, **kwargs)
284324

285325
@doc(
@@ -508,8 +548,8 @@ def kurt(self, **kwargs):
508548
)
509549
def quantile(
510550
self,
511-
quantile,
512-
interpolation="linear",
551+
quantile: float,
552+
interpolation: str = "linear",
513553
**kwargs,
514554
):
515555
return super().quantile(
@@ -549,7 +589,7 @@ def quantile(
549589
)
550590
def cov(
551591
self,
552-
other: Optional[Union[np.ndarray, FrameOrSeries]] = None,
592+
other: Optional[Union[np.ndarray, FrameOrSeriesUnion]] = None,
553593
pairwise: Optional[bool] = None,
554594
ddof: int = 1,
555595
**kwargs,
@@ -614,7 +654,7 @@ def cov(
614654
)
615655
def corr(
616656
self,
617-
other: Optional[Union[np.ndarray, FrameOrSeries]] = None,
657+
other: Optional[Union[np.ndarray, FrameOrSeriesUnion]] = None,
618658
pairwise: Optional[bool] = None,
619659
ddof: int = 1,
620660
**kwargs,

0 commit comments

Comments
 (0)