Fix type annotations in pandas.core.indexes.datetimes #26404

vaibhavhrt · 2019-05-15T06:53:47Z

closes Fix type annotations for pandas.core.indexes.datetimes #26366
tests passed
passes git diff upstream/master -u -- "*.py" | flake8 --diff
whatsnew entry

pandas/core/indexes/timedeltas.py taken care of as well since the errors were the same.

vaibhavhrt · 2019-05-15T06:55:56Z

Errors that still remain are:

pandas\core\indexes\datetimes.py:90: error: Definition of "_data" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"
pandas\core\indexes\datetimes.py:90: error: Definition of "_data" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "DatetimelikeDelegateMixin"
pandas\core\indexes\datetimes.py:90: error: Definition of "map" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"
pandas\core\indexes\datetimes.py:90: error: Definition of "_format_with_header" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"
pandas\core\indexes\datetimes.py:90: error: Definition of "isin" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"

Needs some investigation to decide a single type to use consistently for these attributes across all class.

pandas/core/indexes/datetimes.py

codecov · 2019-05-15T07:53:45Z

Codecov Report

Merging #26404 into master will decrease coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #26404      +/-   ##
==========================================
- Coverage   91.69%   91.68%   -0.01%     
==========================================
  Files         174      174              
  Lines       50743    50744       +1     
==========================================
- Hits        46527    46525       -2     
- Misses       4216     4219       +3

Flag	Coverage Δ
#multiple	`90.19% <100%> (ø)`	⬆️
#single	`41.19% <100%> (-0.13%)`	⬇️

Impacted Files	Coverage Δ
pandas/core/indexes/datetimes.py	`96.86% <100%> (ø)`	⬆️
pandas/io/gbq.py	`78.94% <0%> (-10.53%)`	⬇️
pandas/core/frame.py	`97.02% <0%> (-0.12%)`	⬇️
pandas/util/testing.py	`90.7% <0%> (+0.1%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3b24fb6...ca7e8eb. Read the comment docs.

codecov · 2019-05-15T07:53:47Z

Codecov Report

Merging #26404 into master will decrease coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #26404      +/-   ##
==========================================
- Coverage   91.74%   91.74%   -0.01%     
==========================================
  Files         174      174              
  Lines       50763    50764       +1     
==========================================
- Hits        46575    46573       -2     
- Misses       4188     4191       +3

Flag	Coverage Δ
#multiple	`90.25% <100%> (ø)`	⬆️
#single	`41.72% <83.33%> (-0.07%)`	⬇️

Impacted Files	Coverage Δ
pandas/core/indexes/datetimes.py	`96.86% <100%> (ø)`	⬆️
pandas/core/indexes/datetimelike.py	`98.13% <100%> (ø)`	⬆️
pandas/io/gbq.py	`78.94% <0%> (-10.53%)`	⬇️
pandas/core/frame.py	`97.02% <0%> (-0.12%)`	⬇️
pandas/util/testing.py	`90.7% <0%> (+0.1%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 44d5498...c4a17b5. Read the comment docs.

WillAyd

Looks like an isort failure in CI

pandas/core/indexes/datetimes.py

vaibhavhrt · 2019-05-17T06:49:47Z

@WillAyd some suggestion on what to do with these errors:

pandas\core\indexes\datetimes.py:89: error: Definition of "_data" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"
pandas\core\indexes\datetimes.py:89: error: Definition of "_data" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "DatetimelikeDelegateMixin"
pandas\core\indexes\datetimes.py:89: error: Definition of "map" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"
pandas\core\indexes\datetimes.py:89: error: Definition of "_format_with_header" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"
pandas\core\indexes\datetimes.py:89: error: Definition of "isin" in base class "DatetimeIndexOpsMixin" is incompatible with definition in base class "Index"

List of attributes with conflicting types:

_data

Class Type Initial Value

DatetimeIndexOpsMixin DatetimeLikeArrayMixin None

DatetimelikeDelegateMixin None (using reveal_type) None

Index None (using reveal_type) None

I don't think we should use DatetimeLikeArrayMixin in all three classes. Should I remove the type comment from class DatetimeIndexOpsMixin too?
Making it Optional[DatetimeLikeArrayMixin] in class DatetimeIndexOpsMixin will not fix the error.
map

Class Defintion

DatetimeIndexOpsMixin def map(self, f):

Index def map(self, mapper, na_action=None):
_format_with_header

Class Defintion

DatetimeIndexOpsMixin def _format_with_header(self, header, **kwargs):

Index def _format_with_header(self, header, na_rep='NaN', **kwargs):
isin

Class Defintion

DatetimeIndexOpsMixin def isin(self, values):

Index def isin(self, values, level=None):

I don't see any easy way of fixing the methods which have different parameters. Maybe we should just ignore these errors too.

WillAyd · 2019-05-18T00:32:03Z

Haven’t been able to deeply review but you can try aligning the signatures for the methods - seems like the difference is only optional keywords anyway

vaibhavhrt · 2019-05-19T13:42:49Z

@WillAyd I can fix the last two but what about def map(self, f) and def map(self, mapper, na_action=None). Is f and mapper the same thing?

WillAyd · 2019-05-19T14:11:51Z

I would think they are the same

jreback · 2019-05-19T17:11:07Z

this is ok, @vaibhavhrt you have some checks issue, can you fix up and ping on green

…lasses

… classes

…sues were solved automatically after fixing pandas.core.indexes.datetimes

pandas/core/indexes/datetimelike.py

vaibhavhrt

Make tests pass!

vaibhavhrt · 2019-05-20T08:30:35Z

@WillAyd @jreback I have made all changes and tests are passing now. Please review.

WillAyd

lgtm @jreback

vaibhavhrt · 2019-05-22T16:22:18Z

@jreback please review and merge.

mypy.ini

plammens · 2019-05-23T14:33:31Z

I don't think we should use DatetimeLikeArrayMixin in all three classes. Should I remove the type comment from class DatetimeIndexOpsMixin too?
Making it Optional[DatetimeLikeArrayMixin] in class DatetimeIndexOpsMixin will not fix the error.

I think DatetimeLikeArrayMixin for both Datetime* classes and np.ndarray for Index is also an option–it works, and it is the option that makes most sense to me. (Also because there is a comment that says

pandas/pandas/core/indexes/base.py

Line 522 in 65eac80

# Index._data must always be an ndarray.

).

vaibhavhrt · 2019-05-23T15:31:16Z

@plammens there are a million different classes that inherits from the Index class and all those child classes have some different type for data.

jreback · 2019-05-24T15:32:24Z

thanks @vaibhavhrt

vaibhavhrt added 5 commits May 13, 2019 20:45

fis type annotation

4933ba8

Merge remote-tracking branch 'upstream/master'

64ded46

Merge remote-tracking branch 'upstream/master'

fcfb6ef

fix some errors and remove the module from mypy.ini

cb3c875

fix linting errors

ca7e8eb

vaibhavhrt commented May 15, 2019

View reviewed changes

pandas/core/indexes/datetimes.py Show resolved Hide resolved

WillAyd added the Typing type annotations, mypy/pyright type checking label May 15, 2019

WillAyd reviewed May 15, 2019

View reviewed changes

pandas/core/indexes/datetimes.py Show resolved Hide resolved

vaibhavhrt added 3 commits May 17, 2019 11:17

Merge remote-tracking branch 'upstream/master'

fd3f277

Merge branch 'master' into pandas.core.indexes.datetimes

e82720d

fix import sorting errors

10f1c4d

jreback added this to the 0.25.0 milestone May 19, 2019

vaibhavhrt added 6 commits May 20, 2019 11:30

fix the function signature of map to be consistent across different c…

247dd31

…lasses

don't specify type of _data to make it's type consistent across classes

9bfd9f2

fix signature of function _format_with_header to be consistent across…

4680fd4

… classes

fix signature of function isin to be consistent acoross classes

e59dc6a

Merge branch 'master' into pandas.core.indexes.datetimes

e455bb0

remove pandas.core.indexes.timedeltas from mypy.ini too as all its is…

078d490

…sues were solved automatically after fixing pandas.core.indexes.datetimes

vaibhavhrt commented May 20, 2019

View reviewed changes

pandas/core/indexes/datetimelike.py Outdated Show resolved Hide resolved

vaibhavhrt commented May 20, 2019

View reviewed changes

fix tests (hopefully)

c4a17b5

WillAyd approved these changes May 20, 2019

View reviewed changes

plammens reviewed May 23, 2019

View reviewed changes

mypy.ini Show resolved Hide resolved

jreback merged commit 38dd858 into pandas-dev:master May 24, 2019

pandas-dev deleted a comment from jreback May 24, 2019

vaibhavhrt deleted the pandas.core.indexes.datetimes branch May 24, 2019 23:43

This was referenced May 24, 2019

Remove pandas.core.index.datetimelike from MyPy Blacklist #26280

Merged

Fix type annotations in pandas.core.indexes.period #26518

Merged

another-green pushed a commit to another-green/pandas that referenced this pull request May 29, 2019

Fix type annotations in pandas.core.indexes.datetimes (pandas-dev#26404)

cffbaac

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix type annotations in pandas.core.indexes.datetimes #26404

Fix type annotations in pandas.core.indexes.datetimes #26404

vaibhavhrt commented May 15, 2019 •

edited

Loading

vaibhavhrt commented May 15, 2019 •

edited

Loading

codecov bot commented May 15, 2019

codecov bot commented May 15, 2019 •

edited

Loading

WillAyd left a comment

vaibhavhrt commented May 17, 2019

WillAyd commented May 18, 2019

vaibhavhrt commented May 19, 2019

WillAyd commented May 19, 2019

jreback commented May 19, 2019

vaibhavhrt left a comment •

edited

Loading

vaibhavhrt commented May 20, 2019

WillAyd left a comment

vaibhavhrt commented May 22, 2019

plammens commented May 23, 2019

vaibhavhrt commented May 23, 2019

jreback commented May 24, 2019

Fix type annotations in pandas.core.indexes.datetimes #26404

Fix type annotations in pandas.core.indexes.datetimes #26404

Conversation

vaibhavhrt commented May 15, 2019 • edited Loading

vaibhavhrt commented May 15, 2019 • edited Loading

codecov bot commented May 15, 2019

Codecov Report

codecov bot commented May 15, 2019 • edited Loading

Codecov Report

WillAyd left a comment

Choose a reason for hiding this comment

vaibhavhrt commented May 17, 2019

WillAyd commented May 18, 2019

vaibhavhrt commented May 19, 2019

WillAyd commented May 19, 2019

jreback commented May 19, 2019

vaibhavhrt left a comment • edited Loading

Choose a reason for hiding this comment

vaibhavhrt commented May 20, 2019

WillAyd left a comment

Choose a reason for hiding this comment

vaibhavhrt commented May 22, 2019

plammens commented May 23, 2019

vaibhavhrt commented May 23, 2019

jreback commented May 24, 2019

vaibhavhrt commented May 15, 2019 •

edited

Loading

vaibhavhrt commented May 15, 2019 •

edited

Loading

codecov bot commented May 15, 2019 •

edited

Loading

vaibhavhrt left a comment •

edited

Loading