Skip to content

Commit 77855a1

Browse files
vaibhavhrtjreback
authored andcommitted
Fix type annotation in pandas.compat.numpy.function (#25961)
1 parent b2b09b7 commit 77855a1

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

mypy.ini

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ ignore_errors=True
88
[mypy-pandas.compat]
99
ignore_errors=True
1010

11-
[mypy-pandas.compat.numpy.function]
12-
ignore_errors=True
13-
1411
[mypy-pandas.core.api]
1512
ignore_errors=True
1613

pandas/compat/numpy/function.py

+18-13
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
easier to adjust to future upstream changes in the analogous numpy signatures.
1919
"""
2020
from collections import OrderedDict
21+
from typing import Any, Dict, Optional, Union
2122

2223
from numpy import ndarray
2324

@@ -101,7 +102,8 @@ def validate_argmax_with_skipna(skipna, args, kwargs):
101102
return skipna
102103

103104

104-
ARGSORT_DEFAULTS = OrderedDict()
105+
ARGSORT_DEFAULTS = OrderedDict() \
106+
# type: OrderedDict[str, Optional[Union[int, str]]]
105107
ARGSORT_DEFAULTS['axis'] = -1
106108
ARGSORT_DEFAULTS['kind'] = 'quicksort'
107109
ARGSORT_DEFAULTS['order'] = None
@@ -110,7 +112,8 @@ def validate_argmax_with_skipna(skipna, args, kwargs):
110112

111113
# two different signatures of argsort, this second validation
112114
# for when the `kind` param is supported
113-
ARGSORT_DEFAULTS_KIND = OrderedDict()
115+
ARGSORT_DEFAULTS_KIND = OrderedDict() \
116+
# type: OrderedDict[str, Optional[int]]
114117
ARGSORT_DEFAULTS_KIND['axis'] = -1
115118
ARGSORT_DEFAULTS_KIND['order'] = None
116119
validate_argsort_kind = CompatValidator(ARGSORT_DEFAULTS_KIND, fname='argsort',
@@ -134,7 +137,7 @@ def validate_argsort_with_ascending(ascending, args, kwargs):
134137
return ascending
135138

136139

137-
CLIP_DEFAULTS = dict(out=None)
140+
CLIP_DEFAULTS = dict(out=None) # type Dict[str, Any]
138141
validate_clip = CompatValidator(CLIP_DEFAULTS, fname='clip',
139142
method='both', max_fname_arg_count=3)
140143

@@ -155,13 +158,13 @@ def validate_clip_with_axis(axis, args, kwargs):
155158
return axis
156159

157160

158-
COMPRESS_DEFAULTS = OrderedDict()
161+
COMPRESS_DEFAULTS = OrderedDict() # type: OrderedDict[str, Any]
159162
COMPRESS_DEFAULTS['axis'] = None
160163
COMPRESS_DEFAULTS['out'] = None
161164
validate_compress = CompatValidator(COMPRESS_DEFAULTS, fname='compress',
162165
method='both', max_fname_arg_count=1)
163166

164-
CUM_FUNC_DEFAULTS = OrderedDict()
167+
CUM_FUNC_DEFAULTS = OrderedDict() # type: OrderedDict[str, Any]
165168
CUM_FUNC_DEFAULTS['dtype'] = None
166169
CUM_FUNC_DEFAULTS['out'] = None
167170
validate_cum_func = CompatValidator(CUM_FUNC_DEFAULTS, method='both',
@@ -185,7 +188,7 @@ def validate_cum_func_with_skipna(skipna, args, kwargs, name):
185188
return skipna
186189

187190

188-
ALLANY_DEFAULTS = OrderedDict()
191+
ALLANY_DEFAULTS = OrderedDict() # type: OrderedDict[str, Optional[bool]]
189192
ALLANY_DEFAULTS['dtype'] = None
190193
ALLANY_DEFAULTS['out'] = None
191194
ALLANY_DEFAULTS['keepdims'] = False
@@ -203,26 +206,27 @@ def validate_cum_func_with_skipna(skipna, args, kwargs, name):
203206
validate_max = CompatValidator(MINMAX_DEFAULTS, fname='max',
204207
method='both', max_fname_arg_count=1)
205208

206-
RESHAPE_DEFAULTS = dict(order='C')
209+
RESHAPE_DEFAULTS = dict(order='C') # type: Dict[str, str]
207210
validate_reshape = CompatValidator(RESHAPE_DEFAULTS, fname='reshape',
208211
method='both', max_fname_arg_count=1)
209212

210-
REPEAT_DEFAULTS = dict(axis=None)
213+
REPEAT_DEFAULTS = dict(axis=None) # type: Dict[str, Any]
211214
validate_repeat = CompatValidator(REPEAT_DEFAULTS, fname='repeat',
212215
method='both', max_fname_arg_count=1)
213216

214-
ROUND_DEFAULTS = dict(out=None)
217+
ROUND_DEFAULTS = dict(out=None) # type: Dict[str, Any]
215218
validate_round = CompatValidator(ROUND_DEFAULTS, fname='round',
216219
method='both', max_fname_arg_count=1)
217220

218-
SORT_DEFAULTS = OrderedDict()
221+
SORT_DEFAULTS = OrderedDict() \
222+
# type: OrderedDict[str, Optional[Union[int, str]]]
219223
SORT_DEFAULTS['axis'] = -1
220224
SORT_DEFAULTS['kind'] = 'quicksort'
221225
SORT_DEFAULTS['order'] = None
222226
validate_sort = CompatValidator(SORT_DEFAULTS, fname='sort',
223227
method='kwargs')
224228

225-
STAT_FUNC_DEFAULTS = OrderedDict()
229+
STAT_FUNC_DEFAULTS = OrderedDict() # type: OrderedDict[str, Optional[Any]]
226230
STAT_FUNC_DEFAULTS['dtype'] = None
227231
STAT_FUNC_DEFAULTS['out'] = None
228232

@@ -247,14 +251,15 @@ def validate_cum_func_with_skipna(skipna, args, kwargs, name):
247251
validate_median = CompatValidator(MEDIAN_DEFAULTS, fname='median',
248252
method='both', max_fname_arg_count=1)
249253

250-
STAT_DDOF_FUNC_DEFAULTS = OrderedDict()
254+
STAT_DDOF_FUNC_DEFAULTS = OrderedDict() \
255+
# type: OrderedDict[str, Optional[bool]]
251256
STAT_DDOF_FUNC_DEFAULTS['dtype'] = None
252257
STAT_DDOF_FUNC_DEFAULTS['out'] = None
253258
STAT_DDOF_FUNC_DEFAULTS['keepdims'] = False
254259
validate_stat_ddof_func = CompatValidator(STAT_DDOF_FUNC_DEFAULTS,
255260
method='kwargs')
256261

257-
TAKE_DEFAULTS = OrderedDict()
262+
TAKE_DEFAULTS = OrderedDict() # type: OrderedDict[str, Optional[str]]
258263
TAKE_DEFAULTS['out'] = None
259264
TAKE_DEFAULTS['mode'] = 'raise'
260265
validate_take = CompatValidator(TAKE_DEFAULTS, fname='take',

0 commit comments

Comments
 (0)