Skip to content

Fix type annotation in pandas.compat.numpy.function #25961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 26, 2019
Merged

Fix type annotation in pandas.compat.numpy.function #25961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78c369c
Remove [mypy-pandas.compat.numpy.function] from mypy.ini
vaibhavhrt Apr 1, 2019
b02dfaf
type varibales as indicated by mypy and few others
vaibhavhrt Apr 2, 2019
768603f
use Optional instead of Union
vaibhavhrt Apr 2, 2019
ed43ade
WIP
vaibhavhrt Apr 3, 2019
2f38713
Merge branch 'master' into Fix-Type-Annotation-pandas.compat.numpy.fu…
vaibhavhrt Apr 24, 2019
d2908db
use optional when applicable
vaibhavhrt Apr 24, 2019
8540435
remove Final and make pep8 happy
vaibhavhrt Apr 24, 2019
a647e6f
Merge branch 'master' into Fix-Type-Annotation-pandas.compat.numpy.fu…
vaibhavhrt Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ ignore_errors=True
[mypy-pandas.compat]
ignore_errors=True

[mypy-pandas.compat.numpy.function]
ignore_errors=True

[mypy-pandas.core.api]
ignore_errors=True

Expand Down
31 changes: 18 additions & 13 deletions pandas/compat/numpy/function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
easier to adjust to future upstream changes in the analogous numpy signatures.
"""
from collections import OrderedDict
from typing import Any, Dict, Optional, Union

from numpy import ndarray

Expand Down Expand Up @@ -101,7 +102,8 @@ def validate_argmax_with_skipna(skipna, args, kwargs):
return skipna


ARGSORT_DEFAULTS = OrderedDict()
ARGSORT_DEFAULTS = OrderedDict() \
# type: OrderedDict[str, Optional[Union[int, str]]]
ARGSORT_DEFAULTS['axis'] = -1
ARGSORT_DEFAULTS['kind'] = 'quicksort'
ARGSORT_DEFAULTS['order'] = None
Expand All @@ -110,7 +112,8 @@ def validate_argmax_with_skipna(skipna, args, kwargs):

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


CLIP_DEFAULTS = dict(out=None)
CLIP_DEFAULTS = dict(out=None) # type Dict[str, Any]
validate_clip = CompatValidator(CLIP_DEFAULTS, fname='clip',
method='both', max_fname_arg_count=3)

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


COMPRESS_DEFAULTS = OrderedDict()
COMPRESS_DEFAULTS = OrderedDict() # type: OrderedDict[str, Any]
COMPRESS_DEFAULTS['axis'] = None
COMPRESS_DEFAULTS['out'] = None
validate_compress = CompatValidator(COMPRESS_DEFAULTS, fname='compress',
method='both', max_fname_arg_count=1)

CUM_FUNC_DEFAULTS = OrderedDict()
CUM_FUNC_DEFAULTS = OrderedDict() # type: OrderedDict[str, Any]
CUM_FUNC_DEFAULTS['dtype'] = None
CUM_FUNC_DEFAULTS['out'] = None
validate_cum_func = CompatValidator(CUM_FUNC_DEFAULTS, method='both',
Expand All @@ -185,7 +188,7 @@ def validate_cum_func_with_skipna(skipna, args, kwargs, name):
return skipna


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

RESHAPE_DEFAULTS = dict(order='C')
RESHAPE_DEFAULTS = dict(order='C') # type: Dict[str, str]
validate_reshape = CompatValidator(RESHAPE_DEFAULTS, fname='reshape',
method='both', max_fname_arg_count=1)

REPEAT_DEFAULTS = dict(axis=None)
REPEAT_DEFAULTS = dict(axis=None) # type: Dict[str, Any]
validate_repeat = CompatValidator(REPEAT_DEFAULTS, fname='repeat',
method='both', max_fname_arg_count=1)

ROUND_DEFAULTS = dict(out=None)
ROUND_DEFAULTS = dict(out=None) # type: Dict[str, Any]
validate_round = CompatValidator(ROUND_DEFAULTS, fname='round',
method='both', max_fname_arg_count=1)

SORT_DEFAULTS = OrderedDict()
SORT_DEFAULTS = OrderedDict() \
# type: OrderedDict[str, Optional[Union[int, str]]]
SORT_DEFAULTS['axis'] = -1
SORT_DEFAULTS['kind'] = 'quicksort'
SORT_DEFAULTS['order'] = None
validate_sort = CompatValidator(SORT_DEFAULTS, fname='sort',
method='kwargs')

STAT_FUNC_DEFAULTS = OrderedDict()
STAT_FUNC_DEFAULTS = OrderedDict() # type: OrderedDict[str, Optional[Any]]
STAT_FUNC_DEFAULTS['dtype'] = None
STAT_FUNC_DEFAULTS['out'] = None

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

STAT_DDOF_FUNC_DEFAULTS = OrderedDict()
STAT_DDOF_FUNC_DEFAULTS = OrderedDict() \
# type: OrderedDict[str, Optional[bool]]
STAT_DDOF_FUNC_DEFAULTS['dtype'] = None
STAT_DDOF_FUNC_DEFAULTS['out'] = None
STAT_DDOF_FUNC_DEFAULTS['keepdims'] = False
validate_stat_ddof_func = CompatValidator(STAT_DDOF_FUNC_DEFAULTS,
method='kwargs')

TAKE_DEFAULTS = OrderedDict()
TAKE_DEFAULTS = OrderedDict() # type: OrderedDict[str, Optional[str]]
TAKE_DEFAULTS['out'] = None
TAKE_DEFAULTS['mode'] = 'raise'
validate_take = CompatValidator(TAKE_DEFAULTS, fname='take',
Expand Down