Skip to content

Conversation

@thequackdaddy
Copy link
Contributor

Hello,

In the project I'm building, I've found it much more convenient if I can make a constant dataframe of the same size and with the same shape as my from_bcolz data frame. (So the dataframe is just a column of zero's or one's or whatnot.)

I wanted the divisions to be the same as well to make the processing easier.... and this was the easiest route to that.

Let me know your thoughts.

Thanks.

@mrocklin
Copy link
Member

mrocklin commented Mar 8, 2016

+1 on the content. This looks great!

Can I ask you to rebase in the whoopsie commit? Or perhaps all into one for something of this size?

@thequackdaddy
Copy link
Contributor Author

So this is where I confess I'm not too good with git.

I think what you are suggesting is that I do the following

git checkout master
git fetch origin master
git checkout pd_dataframe_chunksize
git rebase master

Is that right? I've screwed up git a lot.

@thequackdaddy
Copy link
Contributor Author

Wait wait...

git checkout master
git fetch upstream master
git checkout pd_dataframe_chunksize
git rebase master

@mrocklin
Copy link
Member

mrocklin commented Mar 8, 2016

Close. I'm suggesting that you do the following:

git checkout master
git fetch upstream master
git checkout pd_dataframe_chunksize 
git rebase -i master

Then, change pick on the left to squash on the commits that should arguably have been written in the above commit. In your case it will probably look like the following:

pick a0b0a3c ENH: Allow dataframe.from_pandas to accept chunksize or npartitions
squash 0d9913b DOC: Wrote a little more documentation
squash 5c6dcb7 DOC: Whoopsie...

Then you save/exit and rewrite the docstring.

Finally you force push back up to your fork on github. As a warning, this is where you can lose information.

git push -f origin pd_dataframe_chunksize

Alternatively, I can do all of this for you. It's a decent thing to learn how to do though.

@thequackdaddy thequackdaddy force-pushed the pd_dataframe_chunksize branch from 5c6dcb7 to 312625f Compare March 8, 2016 02:54
@thequackdaddy
Copy link
Contributor Author

Yep I screwed it up.

Let me make a new pull request. I think I should have squashed the ones above this commit as well.

@thequackdaddy thequackdaddy deleted the pd_dataframe_chunksize branch March 8, 2016 03:01
@sinhrks sinhrks added this to the 0.8.1 milestone Mar 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants