Skip to content
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

Jump to bottom

BUG: DataFrame.join on tz aware index and column #26362

Merged
merged 3 commits into from
May 14, 2019
Merged

BUG: DataFrame.join on tz aware index and column #26362

merged 3 commits into from
May 14, 2019

Conversation

mroeschke
Copy link
Member

@mroeschke mroeschke added Bug Timezones Timezone data dtype labels May 13, 2019
@mroeschke mroeschke added this to the 0.25.0 milestone May 13, 2019
@codecov
Copy link

codecov bot commented May 13, 2019

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #26362      +/-   ##
==========================================
- Coverage   91.68%   91.67%   -0.01%     
==========================================
  Files         174      174              
  Lines       50700    50705       +5     
==========================================
  Hits        46486    46486              
- Misses       4214     4219       +5
Flag Coverage Δ
#multiple 90.18% <100%> (ø) ⬆️
#single 41.17% <14.28%> (-0.18%) ⬇️
Impacted Files Coverage Δ
pandas/core/reshape/merge.py 94.5% <100%> (+0.03%) ⬆️
pandas/io/gbq.py 78.94% <0%> (-10.53%) ⬇️
pandas/core/frame.py 97.01% <0%> (-0.12%) ⬇️
pandas/util/testing.py 90.6% <0%> (-0.11%) ⬇️

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 b48d1ff...66e16aa. Read the comment docs.

@codecov
Copy link

codecov bot commented May 13, 2019 •
edited
Loading

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #26362      +/-   ##
==========================================
- Coverage   91.68%   91.67%   -0.01%     
==========================================
  Files         174      174              
  Lines       50703    50703              
==========================================
- Hits        46488    46484       -4     
- Misses       4215     4219       +4
Flag Coverage Δ
#multiple 90.18% <100%> (ø) ⬆️
#single 41.17% <0%> (-0.18%) ⬇️
Impacted Files Coverage Δ
pandas/core/reshape/merge.py 94.46% <100%> (ø) ⬆️
pandas/io/gbq.py 78.94% <0%> (-10.53%) ⬇️
pandas/core/frame.py 97.01% <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 a6e43a4...11597b2. Read the comment docs.

jreback
jreback reviewed May 13, 2019
View reviewed changes
pandas/core/reshape/merge.py Outdated
@@ -1671,11 +1671,21 @@ def _right_outer_join(x, y, max_groups):
}


def _convert_array_or_index(arg):
"""Converts DatetimeArray or DatetimeIndex to numpy array in UTC"""
Copy link
Contributor

Choose a reason for hiding this comment

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

this is so opaque

use getattr(arg, ‘_values’, arg)._data

Copy link
Contributor

Choose a reason for hiding this comment

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

How about extract_array(arg)._data?

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the simplification. Went with the getattr solution.

@jreback jreback merged commit 7ba2ec8 into pandas-dev:master May 14, 2019
@jreback
Copy link
Contributor

jreback commented May 14, 2019

thanks @mroeschke

@mroeschke mroeschke deleted the join_tz branch May 14, 2019 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomAugspurger TomAugspurger TomAugspurger left review comments

@jreback jreback jreback left review comments

@gfyoung gfyoung gfyoung approved these changes

Assignees
No one assigned
Labels
Bug Timezones Timezone data dtype
Projects
None yet
Milestone
0.25.0
Development

Successfully merging this pull request may close these issues.

Left join on column with timezone aware index with unexpected behavior
4 participants
@mroeschke @jreback @TomAugspurger @gfyoung