Skip to content

BUG: DataFrame.asof() : Timezone Awareness / Naivety comparison TypeError #22198

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
Merged
merged 6 commits into from
Aug 6, 2018
Merged

BUG: DataFrame.asof() : Timezone Awareness / Naivety comparison TypeError #22198

merged 6 commits into from
Aug 6, 2018
+21 −1

Conversation

msmarchena
Copy link
Contributor

@codecov
Copy link

codecov bot commented Aug 4, 2018 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@0850fbd). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #22198   +/-   ##
=========================================
  Coverage          ?   92.06%           
=========================================
  Files             ?      169           
  Lines             ?    50694           
  Branches          ?        0           
=========================================
  Hits              ?    46671           
  Misses            ?     4023           
  Partials          ?        0
Flag Coverage Δ
#multiple 90.47% <100%> (?)
#single 42.32% <0%> (?)
Impacted Files Coverage Δ
pandas/core/indexes/base.py 96.37% <100%> (ø)

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 0850fbd...71f9f56. Read the comment docs.

@gfyoung gfyoung added Datetime Datetime data dtype Indexing Related to indexing on series/frames, not to indexes themselves Dtype Conversions Unexpected or buggy dtype conversions labels Aug 4, 2018
gfyoung
gfyoung approved these changes Aug 4, 2018
View reviewed changes
Copy link
Member

@gfyoung gfyoung left a comment

Choose a reason for hiding this comment

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

LGTM!

cc @jreback @TomAugspurger

mroeschke
mroeschke requested changes Aug 5, 2018
View reviewed changes
doc/source/whatsnew/v0.23.1.txt Outdated
@@ -138,3 +138,4 @@ Bug Fixes

- Tab completion on :class:`Index` in IPython no longer outputs deprecation warnings (:issue:`21125`)
- Bug preventing pandas being used on Windows without C++ redistributable installed (:issue:`21106`)
- Bug in :func:`Dataframe.asof` that raised a ``TypeError`` when attempting to compare tz-naive and tz-aware timestamps (:issue:`21194`)
Copy link
Member

Choose a reason for hiding this comment

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

Could you move this entry to v0.24.0.txt?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have moved the entry to v0.24.0.txt, section "Timezones". I hope it is OK.

Copy link
Member

Choose a reason for hiding this comment

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

Good choice!

gfyoung
gfyoung reviewed Aug 5, 2018
View reviewed changes
doc/source/whatsnew/v0.23.1.txt Outdated
@@ -137,4 +137,4 @@ Bug Fixes
**Other**

- Tab completion on :class:`Index` in IPython no longer outputs deprecation warnings (:issue:`21125`)
- Bug preventing pandas being used on Windows without C++ redistributable installed (:issue:`21106`)
Copy link
Member

Choose a reason for hiding this comment

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

Can we undo this diff here?

Copy link
Contributor Author

@msmarchena msmarchena Aug 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Every thing looks OK in my local and in github. I don't know how this happen.

Copy link
Member

@gfyoung gfyoung Aug 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

No need to. Just run (relative to your pandas code directory):

git checkout origin/master doc/source/whatsnew/v0.23.1.txt

Commit this change and push it.

Copy link
Contributor Author

@msmarchena msmarchena Aug 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I'm going to delete the wrong commits

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have deleted the commit and done a new one. I don't understand I didn't touch that line and it's there again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have done your suggestion. I hope it is OK

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's not passing the Travis CI test. Any idea?

Copy link
Member

Choose a reason for hiding this comment

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

CI looks good to me 🙂

@gfyoung
Copy link
Member

gfyoung commented Aug 5, 2018

@jreback @mroeschke Can you have a look? This looks ready to merge.

@jreback jreback modified the milestones: 0.24.0, 0.23.5 Aug 6, 2018
@jreback jreback merged commit 028492d into pandas-dev:master Aug 6, 2018
@jreback
Copy link
Contributor

jreback commented Aug 6, 2018

thanks @msmarchena

@msmarchena
Copy link
Contributor Author

Thanks to all of you.

@msmarchena
Copy link
Contributor Author

and sorry for the mess, it was my first PR ;-)

Sup3rGeo pushed a commit to Sup3rGeo/pandas that referenced this pull request Oct 1, 2018
@msmarchena
BUG: DataFrame.asof() : Timezone Awareness / Naivety comparison TypeE…
1c2f98e 
…rror (pandas-dev#22198)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gfyoung gfyoung gfyoung approved these changes

@mroeschke mroeschke mroeschke approved these changes

Assignees
No one assigned
Labels
Datetime Datetime data dtype Dtype Conversions Unexpected or buggy dtype conversions Indexing Related to indexing on series/frames, not to indexes themselves
Projects
None yet
Milestone
0.24.0
Development

Successfully merging this pull request may close these issues.

DataFrame.asof() : Timezone Awareness / Naivety comparison TypeError (incorrect)
4 participants
@msmarchena @gfyoung @jreback @mroeschke