[ENH] Move intersection functions for DatetimeIndex and TimedeltaIndex to Datetimelike and added new tests #25913

fdroessler · 2019-03-28T19:08:36Z

closes TimedeltaIndex.intersection has no sort option. #24966
tests added / passed
passes git diff upstream/master -u -- "*.py" | flake8 --diff
whatsnew entry

Because DatetimeIndex and TimedeltaIndex intersections are similar, I have moved the intersection function of both classes up into Datetimelike after discussions with @reidy-p @jorisvandenbossche. At the same time for PeriodIndex I have used Index.intersection instead. Additionally I have added some tests to TimedeltaIndex recycling some tests from DatetimeIndex.

Re-open from #25121

…atetimelike. Point PeriodIndex intersection to Index.intersection

doc/source/whatsnew/v0.25.0.rst

pandas/core/indexes/datetimelike.py

pandas/tests/indexes/timedeltas/test_setops.py

codecov · 2019-03-28T20:19:10Z

Codecov Report

Merging #25913 into master will increase coverage by <.01%.
The diff coverage is 93.75%.

@@            Coverage Diff             @@
##           master   #25913      +/-   ##
==========================================
+ Coverage   91.56%   91.56%   +<.01%     
==========================================
  Files         175      175              
  Lines       52775    52760      -15     
==========================================
- Hits        48324    48312      -12     
+ Misses       4451     4448       -3

Flag	Coverage Δ
#multiple	`90.13% <93.75%> (ø)`	⬆️
#single	`41.84% <43.75%> (-0.06%)`	⬇️

Impacted Files	Coverage Δ
pandas/core/indexes/period.py	`92.12% <100%> (+0.05%)`	⬆️
pandas/core/indexes/datetimes.py	`96.86% <100%> (+0.45%)`	⬆️
pandas/core/indexes/timedeltas.py	`91.09% <100%> (+0.82%)`	⬆️
pandas/core/indexes/datetimelike.py	`97.89% <92.3%> (-0.64%)`	⬇️
pandas/io/gbq.py	`75% <0%> (-12.5%)`	⬇️
pandas/core/frame.py	`96.79% <0%> (-0.12%)`	⬇️
pandas/util/testing.py	`90.56% <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 31b4019...05c2916. Read the comment docs.

codecov · 2019-03-28T20:19:13Z

Codecov Report

Merging #25913 into master will increase coverage by <.01%.
The diff coverage is 95.45%.

@@            Coverage Diff             @@
##           master   #25913      +/-   ##
==========================================
+ Coverage   91.97%   91.97%   +<.01%     
==========================================
  Files         175      175              
  Lines       52368    52349      -19     
==========================================
- Hits        48164    48148      -16     
+ Misses       4204     4201       -3

Flag	Coverage Δ
#multiple	`90.53% <95.45%> (ø)`	⬆️
#single	`40.72% <52.27%> (-0.12%)`	⬇️

Impacted Files	Coverage Δ
pandas/core/indexes/period.py	`92.1% <100%> (+0.05%)`	⬆️
pandas/core/indexes/datetimes.py	`96.85% <100%> (+0.45%)`	⬆️
pandas/core/indexes/timedeltas.py	`91.59% <100%> (+0.86%)`	⬆️
pandas/core/indexes/datetimelike.py	`98.13% <94.28%> (-0.4%)`	⬇️
pandas/io/gbq.py	`78.94% <0%> (-10.53%)`	⬇️
pandas/core/frame.py	`96.9% <0%> (-0.12%)`	⬇️

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 9feb3ad...0d7205d. Read the comment docs.

fdroessler · 2019-03-29T19:27:05Z

@gfyoung not sure if I should mark the comments as resolved or if you do it once you had a look at it. Please let me know what the general practice is on those so I know for the future.

doc/source/whatsnew/v0.25.0.rst

pandas/core/indexes/datetimelike.py

pandas/core/indexes/timedeltas.py

pandas/tests/indexes/timedeltas/test_setops.py

pandas/core/indexes/timedeltas.py

pandas/tests/indexes/timedeltas/test_setops.py

fdroessler · 2019-04-12T09:16:35Z

@jreback Is there anything else? Do you want me to create a new issue re restructuring the tests?

jreback

small comments, yes pls file an issue to consolidate set_op tests across indexes

pandas/tests/indexes/timedeltas/test_setops.py

jreback · 2019-04-12T11:39:47Z

@TomAugspurger if you could have a look

TomAugspurger · 2019-04-12T13:00:05Z

Probably won’t be able to for a while. Don’t hold this up because of me.

…

On Apr 12, 2019, at 06:39, Jeff Reback ***@***.***> wrote: @TomAugspurger if you could have a look — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

jreback · 2019-04-20T17:02:40Z

@fdroessler can you merge master and will have a look.

fdroessler · 2019-04-21T12:08:25Z

@jreback sure, done

doc/source/whatsnew/v0.25.0.rst

pandas/core/indexes/timedeltas.py

pandas/core/indexes/datetimes.py

jreback · 2019-04-28T18:45:46Z

can you merge master

fdroessler · 2019-04-29T18:33:26Z

Done @jreback

jreback · 2019-04-30T13:15:04Z

thanks @fdroessler very nice!

fdroessler added 9 commits March 27, 2019 21:46

Moving intersection method from DatetimeIndex and Timedeltaindex to d…

0464269

…atetimelike. Point PeriodIndex intersection to Index.intersection

add tests for timedeltaindex

119a995

add whatsnew

78821ba

fixing isort issue

c8d8155

isort issue

e6dba96

update whatsnew

4a115a2

update docstrings

da2506b

parametrize tests

8e2a80b

add compatibility of super with python2

05c2916

fdroessler mentioned this pull request Mar 28, 2019

[ENH] Move intersection functions for DatetimeIndex and TimedeltaIndex to Datetimelike and added tests #25121

Closed

4 tasks

gfyoung added Timedelta Timedelta data type Clean labels Mar 28, 2019

gfyoung reviewed Mar 28, 2019

View reviewed changes

doc/source/whatsnew/v0.25.0.rst Outdated Show resolved Hide resolved

gfyoung reviewed Mar 28, 2019

View reviewed changes

doc/source/whatsnew/v0.25.0.rst Outdated Show resolved Hide resolved

gfyoung reviewed Mar 28, 2019

View reviewed changes

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

gfyoung reviewed Mar 28, 2019

View reviewed changes

pandas/tests/indexes/timedeltas/test_setops.py Show resolved Hide resolved

Added PR review comments

8554cf9

jreback requested changes Mar 30, 2019

View reviewed changes

fdroessler added 2 commits April 2, 2019 10:28

jreback comments

666b523

added test

ed6c61d

jreback requested changes Apr 2, 2019

View reviewed changes

pandas/tests/indexes/timedeltas/test_setops.py Show resolved Hide resolved

pandas/tests/indexes/timedeltas/test_setops.py Show resolved Hide resolved

jreback requested changes Apr 4, 2019

View reviewed changes

further feedback

a9a63f7

jreback requested changes Apr 12, 2019

View reviewed changes

pandas/tests/indexes/timedeltas/test_setops.py Outdated Show resolved Hide resolved

pandas/tests/indexes/timedeltas/test_setops.py Outdated Show resolved Hide resolved

pandas/tests/indexes/timedeltas/test_setops.py Outdated Show resolved Hide resolved

jreback added this to the 0.25.0 milestone Apr 12, 2019

result/expected and comment

2d8ed0b

fdroessler mentioned this pull request Apr 13, 2019

TST: consolidate set_op tests across indexes #26077

Closed

Merge branch 'master' into datetime_timedelta_intersection

3e3aa81

jreback requested changes Apr 21, 2019

View reviewed changes

doc/source/whatsnew/v0.25.0.rst Outdated Show resolved Hide resolved

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

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

fdroessler added 2 commits April 29, 2019 19:31

update

c7e27bf

Merge branch 'master' into datetime_timedelta_intersection

0d7205d

jreback approved these changes Apr 30, 2019

View reviewed changes

jreback merged commit 34da8be into pandas-dev:master Apr 30, 2019

makbigc mentioned this pull request May 1, 2019

BUG: TimedeltaIndex.intersection fails for decreasing TimedeltaIndex #17391

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ENH] Move intersection functions for DatetimeIndex and TimedeltaIndex to Datetimelike and added new tests #25913

[ENH] Move intersection functions for DatetimeIndex and TimedeltaIndex to Datetimelike and added new tests #25913

fdroessler commented Mar 28, 2019

codecov bot commented Mar 28, 2019

codecov bot commented Mar 28, 2019 •

edited

Loading

fdroessler commented Mar 29, 2019

fdroessler commented Apr 12, 2019

jreback left a comment •

edited

Loading

jreback commented Apr 12, 2019

TomAugspurger commented Apr 12, 2019 via email

jreback commented Apr 20, 2019

fdroessler commented Apr 21, 2019

jreback commented Apr 28, 2019

fdroessler commented Apr 29, 2019

jreback commented Apr 30, 2019

[ENH] Move intersection functions for DatetimeIndex and TimedeltaIndex to Datetimelike and added new tests #25913

[ENH] Move intersection functions for DatetimeIndex and TimedeltaIndex to Datetimelike and added new tests #25913

Conversation

fdroessler commented Mar 28, 2019

codecov bot commented Mar 28, 2019

Codecov Report

codecov bot commented Mar 28, 2019 • edited Loading

Codecov Report

fdroessler commented Mar 29, 2019

fdroessler commented Apr 12, 2019

jreback left a comment • edited Loading

Choose a reason for hiding this comment

jreback commented Apr 12, 2019

TomAugspurger commented Apr 12, 2019 via email

jreback commented Apr 20, 2019

fdroessler commented Apr 21, 2019

jreback commented Apr 28, 2019

fdroessler commented Apr 29, 2019

jreback commented Apr 30, 2019

codecov bot commented Mar 28, 2019 •

edited

Loading

jreback left a comment •

edited

Loading