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.

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

TST: add test for get_loc on tz-aware DatetimeIndex #32152

Merged
merged 3 commits into from
Feb 21, 2020

Conversation

simonjayhawkins
Copy link
Member

@simonjayhawkins simonjayhawkins added the Testing pandas testing functions or related to the test suite label Feb 21, 2020
key = pd.Timestamp("2019-12-12 10:19:25", tz="US/Eastern")
result = dti.get_loc(key, method="nearest")
assert result == 7433

Copy link
Member

Choose a reason for hiding this comment

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

nitpick (not a blocker), can you put this a few tests up adjacent to the other tests that use the method kwarg

Copy link
Member Author

Choose a reason for hiding this comment

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

sure. done.

Copy link
Member

Choose a reason for hiding this comment

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

thanks

@jbrockmendel
Copy link
Member

LGTM

@jreback jreback added this to the 1.0.2 milestone Feb 21, 2020
@jreback jreback merged commit d171c87 into pandas-dev:master Feb 21, 2020
@jreback
Copy link
Contributor

jreback commented Feb 21, 2020

thanks @simonjayhawkins

@lumberbot-app
Copy link

lumberbot-app bot commented Feb 21, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 d171c871baa13bdfd2fe14c8a5918190314825bb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #32152: TST: add test for get_loc on tz-aware DatetimeIndex'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-32152-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #32152 on branch 1.0.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@jreback
Copy link
Contributor

jreback commented Feb 21, 2020

@simonjayhawkins may need a manual backport

simonjayhawkins added a commit to simonjayhawkins/pandas that referenced this pull request Feb 21, 2020
@simonjayhawkins simonjayhawkins deleted the test_get_loc_tz_aware branch February 21, 2020 19:39
WillAyd pushed a commit that referenced this pull request Feb 21, 2020
roberthdevries pushed a commit to roberthdevries/pandas that referenced this pull request Mar 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Testing pandas testing functions or related to the test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pandas 1.0.1 fails get_loc on timeindex (0.25.3 works)
3 participants