Skip to content

Conversation

@cpcloud
Copy link
Member

@cpcloud cpcloud commented Jun 6, 2014

closes #7366

@cpcloud cpcloud added this to the 0.14.1 milestone Jun 6, 2014
@cpcloud cpcloud self-assigned this Jun 6, 2014
@cpcloud
Copy link
Member Author

cpcloud commented Jun 6, 2014

WTF? I pushed fb38fb6 and it says merged here: 3ea8c7a from the link on travis

https://travis-ci.org/pydata/pandas/jobs/26909698

@fonnesbeck
Copy link

Well, the fix did the trick. I tested from your repo.

@cpcloud
Copy link
Member Author

cpcloud commented Jun 6, 2014

glad it works for you! just a little confused why travis has a commit that doesn't exist on my end but somehow exists in the GitHub ether and travis is able to check it out and run it. somehow my test is there but not the fix 😕

@jreback
Copy link
Contributor

jreback commented Jun 6, 2014

that weird Travis bug

it somehow picks up a different merged commit

@cpcloud
Copy link
Member Author

cpcloud commented Jun 6, 2014

good ol' rehash to the rescue 😎

@cpcloud
Copy link
Member Author

cpcloud commented Jun 6, 2014

well for one thing this checkout line is wrong:

git fetch origin +refs/pull/7367/merge as there was only ever a single commit without a merge yet somehow one was created on GitHub

@cpcloud
Copy link
Member Author

cpcloud commented Jun 6, 2014

shoudl be ok now ... it's checking out directly from the hash

@cpcloud
Copy link
Member Author

cpcloud commented Jun 6, 2014

ok i'm going to get out of the car and get back in .... make a new pr because something is really screwy .. commit hash is there but the changes are not

@cpcloud cpcloud closed this Jun 6, 2014
@cpcloud cpcloud deleted the fix-float-mixed-7366 branch June 6, 2014 03:45
@cpcloud cpcloud restored the fix-float-mixed-7366 branch June 6, 2014 03:45
@cpcloud cpcloud deleted the fix-float-mixed-7366 branch June 6, 2014 03:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug Indexing Related to indexing on series/frames, not to indexes themselves Regression Functionality that used to work in a prior pandas version

3 participants