-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: fix alignment in series ops (GH14227) #14230
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.
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
BUG: fix alignment in series ops (GH14227) #14230
Conversation
d673b44
to
82fb2ab
Compare
Current coverage is 85.26% (diff: 76.92%)@@ master #14230 diff @@
==========================================
Files 140 140
Lines 50619 50630 +11
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 43161 43168 +7
- Misses 7458 7462 +4
Partials 0 0
|
# if DatetimeIndex have different tz, convert to UTC | ||
left.index = index | ||
right.index = index | ||
if is_datetime64tz_dtype(left.index): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be inside .join
not here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean in align
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, that's what I mean
@jorisvandenbossche can you update |
82fb2ab
to
1e68c20
Compare
c128626
to
94d5f80
Compare
94d5f80
to
66d35d1
Compare
@jreback I moved this to align (and therefore also fixing the bug in align), but it is still not yet that clean ... |
if this works (and you want to push in 0.19.0), ok.. maybe just add a TODO / issue to fix/clean later (otherwise better wait for 0.19.1) |
Well, it was a hack before, and it is still the exact same hack now, only moved down the stack into align (fixing the behaviour of align as well), so merging for now. |
git diff upstream/master | flake8 --diff