Skip to content

Fix type annotations in pandas.core.computation #26295

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 7 commits into from
May 8, 2019
Merged

Fix type annotations in pandas.core.computation #26295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26328d6
Add type annotations to core.computation
gwrome May 6, 2019
ce2b686
Re-trigger hung test
gwrome May 6, 2019
f079483
Merge branch 'master' into blacklist-computation
gwrome May 7, 2019
9f50c95
Merge master
gwrome May 7, 2019
a618c54
Remove Term.name setter and type annotation
gwrome May 7, 2019
8a47710
Merge master
gwrome May 7, 2019
2061229
Merge branch 'master' into blacklist-computation
gwrome May 7, 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
9 changes: 0 additions & 9 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ ignore_errors=True
[mypy-pandas.core.base]
ignore_errors=True

[mypy-pandas.core.computation.expr]
ignore_errors=True

[mypy-pandas.core.computation.ops]
ignore_errors=True

[mypy-pandas.core.computation.pytables]
ignore_errors=True

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

Expand Down
3 changes: 2 additions & 1 deletion pandas/core/computation/expr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import itertools as it
import operator
import tokenize
from typing import Type

import numpy as np

Expand Down Expand Up @@ -327,7 +328,7 @@ class BaseExprVisitor(ast.NodeVisitor):
parser : str
preparser : callable
"""
const_type = Constant
const_type = Constant # type: Type[Term]
term_type = Term

binary_ops = _cmp_ops_syms + _bool_ops_syms + _arith_ops_syms
Expand Down
3 changes: 2 additions & 1 deletion pandas/core/computation/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ def __init__(self, value, env, side=None, encoding=None):
def _resolve_name(self):
return self._name

@property
# read-only property overwriting read/write
@property # type: ignore
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handling these as here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we just remove the setters from the base class or are they actually used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove the name setter, but removing the the value setter flunks a whole mess of tests. Will push a commit with the former and its accompanying type comment removed. Merging master while I'm at it.

def name(self):
return self.value

Expand Down
3 changes: 2 additions & 1 deletion pandas/core/computation/pytables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ def _resolve_name(self):
except UndefinedVariableError:
return self.name

@property
# read-only property overwriting read/write property
@property # type: ignore
def value(self):
return self._value

Expand Down