Skip to content

CLN: Fixing mypy errors in pandas/conftest.py #29046

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 16 commits into from
Mar 25, 2020
Merged

CLN: Fixing mypy errors in pandas/conftest.py #29046

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bfc175e
Ignoring some mypy errors related to imports and list inference
angelaambroz Oct 17, 2019
6408388
Adding Dtype
angelaambroz Oct 17, 2019
f4afbb2
Two spaces
angelaambroz Oct 17, 2019
ce2d9b7
MR comments
angelaambroz Oct 18, 2019
96a09ec
MR comments, removing type ignore
angelaambroz Oct 18, 2019
f07b7a0
Type Union etc
angelaambroz Oct 19, 2019
77543f2
Forgot Type
angelaambroz Oct 21, 2019
50dadb2
PR comments
angelaambroz Nov 2, 2019
5bce559
Merge conflict importing Type in _typing
angelaambroz Nov 2, 2019
1856a58
Merge remote-tracking branch 'upstream/master' into issue28926_conftest
angelaambroz Dec 13, 2019
4be05dc
PR comments
angelaambroz Dec 13, 2019
3fbf980
Update pandas/_typing.py
angelaambroz Dec 29, 2019
05bb32b
Merge conflicts
angelaambroz Jan 16, 2020
4b8b565
Fixing import sort order
angelaambroz Jan 16, 2020
a920f28
Merge conflicts
angelaambroz Mar 25, 2020
dd279e9
Linting
angelaambroz Mar 25, 2020
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
4 changes: 2 additions & 2 deletions pandas/_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from pathlib import Path
from typing import IO, TYPE_CHECKING, AnyStr, Iterable, Optional, TypeVar, Union
from typing import IO, TYPE_CHECKING, AnyStr, Iterable, Optional, TypeVar, Union, Type

import numpy as np

Expand All @@ -18,7 +18,7 @@
AnyArrayLike = TypeVar("AnyArrayLike", "ExtensionArray", "Index", "Series", np.ndarray)
ArrayLike = TypeVar("ArrayLike", "ExtensionArray", np.ndarray)
DatetimeLikeScalar = TypeVar("DatetimeLikeScalar", "Period", "Timestamp", "Timedelta")
Dtype = Union[str, np.dtype, "ExtensionDtype"]
Dtype = Type[Union[str, float, bool, np.dtype, "ExtensionDtype"]]
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Dtype = Type[Union[str, float, bool, np.dtype, "ExtensionDtype"]]
Dtype = Union[ExtensionDtype, Type[Union[str, float, int, complex, bool]]]

Somewhat more complicated but the ExtensionDtype needs to be an instance, so should exclude from the Type element.

To illustrate:

>>> pd.Series(range(1), dtype=pd.Int64Dtype)  # Not what you would expect
0    0
dtype: object
>>> pd.Series(range(1), dtype=pd.Int64Dtype())  # This instance works though
0    0
dtype: object
>>> pd.Series(range(1), dtype=int) # contrast to the builtin, which uses Type[int]
0    0
dtype: int64

cc @TomAugspurger in case there's something I'm missing with the ExtensionDtype

Also @simonjayhawkins do you mind if we include int in the Union? Understood that it gets replaced as part of the mypy type hierarchy, but given dtype=int is a valid construct it serves as literal documentation and requires less knowledge of how mypy works. Whenever we get to Python 3.8 as the min version these should be converted to Literal annotations anyway

Copy link
Contributor

Choose a reason for hiding this comment

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

>>> pd.Series(range(1), dtype=pd.Int64Dtype)

should probably raise. I don't think we can automatically make that work since we have parametrized dtypes. Not sure what that does to the type hint.

Copy link
Member

Choose a reason for hiding this comment

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

Also @simonjayhawkins do you mind if we include int in the Union?

no problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👋 Sorry for the silence on my end. I'm picking this up again now. I didn't follow your comment, @WillAyd (though I committed your suggestion - hence the Outdated flag). Does this requested review still apply? Thanks.

FilePathOrBuffer = Union[str, Path, IO[AnyStr]]

FrameOrSeries = TypeVar("FrameOrSeries", bound="NDFrame")
Expand Down
10 changes: 6 additions & 4 deletions pandas/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from decimal import Decimal
import operator
import os
from typing import List

from dateutil.tz import tzlocal, tzutc
import hypothesis
Expand All @@ -11,6 +12,7 @@
from pytz import FixedOffset, utc

import pandas.util._test_decorators as td
from pandas._typing import Dtype

import pandas as pd
from pandas import DataFrame
Expand Down Expand Up @@ -481,14 +483,14 @@ def tz_aware_fixture(request):

UNSIGNED_INT_DTYPES = ["uint8", "uint16", "uint32", "uint64"]
UNSIGNED_EA_INT_DTYPES = ["UInt8", "UInt16", "UInt32", "UInt64"]
SIGNED_INT_DTYPES = [int, "int8", "int16", "int32", "int64"]
SIGNED_INT_DTYPES = [int, "int8", "int16", "int32", "int64"] # type: List[Dtype]
Copy link
Member

Choose a reason for hiding this comment

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

will need to change to py3.6 syntax.

SIGNED_EA_INT_DTYPES = ["Int8", "Int16", "Int32", "Int64"]
ALL_INT_DTYPES = UNSIGNED_INT_DTYPES + SIGNED_INT_DTYPES
ALL_EA_INT_DTYPES = UNSIGNED_EA_INT_DTYPES + SIGNED_EA_INT_DTYPES

FLOAT_DTYPES = [float, "float32", "float64"]
COMPLEX_DTYPES = [complex, "complex64", "complex128"]
STRING_DTYPES = [str, "str", "U"]
FLOAT_DTYPES = [float, "float32", "float64"] # type: List[Dtype]
COMPLEX_DTYPES = [complex, "complex64", "complex128"] # type: List[Dtype]
STRING_DTYPES = [str, "str", "U"] # type: List[Dtype]
Copy link
Member

Choose a reason for hiding this comment

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

same


DATETIME64_DTYPES = ["datetime64[ns]", "M8[ns]"]
TIMEDELTA64_DTYPES = ["timedelta64[ns]", "m8[ns]"]
Expand Down