Skip to content

DOC: Flesh out the R comparison section of docs (GH3980) #5761

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
merged 3 commits into from
Dec 28, 2013
Merged

DOC: Flesh out the R comparison section of docs (GH3980) #5761

merged 3 commits into from
Dec 28, 2013

Conversation

HeardACat
Copy link
Contributor

Some additions to #3980.

I've done some more comparisons to the plyr functions located here. More specifically aaply, alply don't really have much to do with pandas (its just list comprehension). and dlply is probably more suited to be in statsmodel example rather than pandas.

@ghost
Copy link

ghost commented Dec 21, 2013

Thanks @chappers , this is useful stuff. But the PR violates a bunch of git-related guidelines
explained in CONTRIBUTING.md:

  • You merged master into your PR branch.
  • You developed the PR on top of a pandas commit from 6 months ago, that's about 2500 commits
    back in the fog of time.

Both of these do nasy things to the git history and so the devs follow a bunch of rules on how to use git to avoid that.

Please fix it yourself or let us know if you need git help. It's fine if you do, we all did at some point.
We value your work, we want your help making pandas better, but please follow the guidelines or ask
for help if you need it.

@jtratner
Copy link
Contributor

@chappers - easiest is just to copy paste your changes to a separate file, checkout current master, and then paste them back on. Since it's docs and a relatively new section of the docs, you should be fine.

@HeardACat
Copy link
Contributor Author

Yeah...I don't have any idea what I'm doing. So I'm suppose to update a branch to upstream/master and then run git rebase on it? And then submit a PR?

@ghost
Copy link

ghost commented Dec 21, 2013

No, that would have prevented this, now you need to fix the existing branch.

upddate your master branch to point at current master on github, then
checkout your PR branch. then:

[chappers-r-compare] % git reset master    # reset head, your "starting point", without changing the working copy
Unstaged changes after reset:
M   doc/source/comparison_with_r.rst
[chappers-r-compare] % ga doc/source/comparison_with_r.rst
[chappers-r-compare] % gc -m "DOC: your description here"
# and finally force push to clobber the current PR branch on github with the repaired one
git push -f

@HeardACat
Copy link
Contributor Author

Thanks a lot.

@ghost
Copy link

ghost commented Dec 22, 2013

nicely done.

@jorisvandenbossche
Copy link
Member

Thanks for this work!
I add some comments inline.

@@ -5,6 +5,8 @@
:suppress:

from pandas import *
import numpy.random as random
from numpy import *
Copy link
Member

Choose a reason for hiding this comment

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

Can you import numpy as np? (and maybe also pandas as pd)

@jreback
Copy link
Contributor

jreback commented Dec 27, 2013

since this is only docs, as soon as @jorisvandenbossche , @y-p ok...then can merge it in

@ghost
Copy link

ghost commented Dec 27, 2013

I haven't run sphinx, but assuming it's ok... merge away.

@jorisvandenbossche
Copy link
Member

I ran Sphinx with this, and its OK. I cannot judge everything in the PR (the R code), but it seems OK.

@jreback
Copy link
Contributor

jreback commented Dec 28, 2013

ok will merge and can check how

jreback added a commit that referenced this pull request Dec 28, 2013
DOC: Flesh out the R comparison section of docs (GH3980)
@jreback jreback merged commit 12eb775 into pandas-dev:master Dec 28, 2013
@jreback
Copy link
Contributor

jreback commented Dec 30, 2013

@chappers

docs look good

http://pandas.pydata.org/pandas-docs/dev/comparison_with_r.html

feel free to add more :)

@HeardACat HeardACat deleted the r-compare branch January 1, 2014 05:01
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.

4 participants