Skip to content

TST: add test for DataFrame.reindex on nearest tz-aware DatetimeIndex #32155

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

Merged

Conversation

simonjayhawkins
Copy link
Member

@simonjayhawkins simonjayhawkins added the Testing pandas testing functions or related to the test suite label Feb 21, 2020
@jreback jreback added this to the 1.0.2 milestone Feb 21, 2020
@jreback jreback merged commit 9353ca7 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 9353ca736d512ac28fd788ffc60e9e70393e5f6d
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #32155: TST: add test for DataFrame.reindex on nearest tz-aware DatetimeIndex'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-32155-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #32155 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.

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.

Reindex on nearest datetime gives UFuncTypeError - subtract with dtype('<M8[ns]') and dtype('O')
2 participants