Skip to content

Conversation

dsaxton
Copy link
Member

@dsaxton dsaxton commented Aug 21, 2020

@dsaxton dsaxton added Bug Constructors Series/DataFrame/Index/pd.array Constructors Sparse Sparse Data Type Datetime Datetime data dtype labels Aug 21, 2020
@simonjayhawkins simonjayhawkins added this to the 1.1.2 milestone Aug 25, 2020
@jbrockmendel
Copy link
Member

LGTM

@jreback jreback merged commit d0ca4b3 into pandas-dev:master Aug 27, 2020
@jreback
Copy link
Contributor

jreback commented Aug 27, 2020

thanks @dsaxton

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 27, 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.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 d0ca4b347b060bc4a49b2d31a818d5a28d1e665f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #35838: Fix Series construction from Sparse["datetime64[ns]"]'
  1. Push to a named branch :
git push YOURFORK 1.1.x:auto-backport-of-pr-35838-on-1.1.x
  1. Create a PR against branch 1.1.x, I would have named this PR:

"Backport PR #35838 on branch 1.1.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.

@dsaxton dsaxton deleted the sparse-datetime-series-construction branch August 27, 2020 02:29
@dsaxton
Copy link
Member Author

dsaxton commented Aug 27, 2020

Manual backport PR: #35915

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Constructors Series/DataFrame/Index/pd.array Constructors Datetime Datetime data dtype Sparse Sparse Data Type
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG: Sparse[datetime64[ns]] TypeError: data type not understood
4 participants