Skip to content

Scatterplot Update for #3473 #4930

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

Closed
wants to merge 5 commits into from
Closed

Scatterplot Update for #3473 #4930

wants to merge 5 commits into from

Conversation

zachcp
Copy link

@zachcp zachcp commented Sep 22, 2013

Rebased Code for Scatterplot targetting bug #3473

def __init__(self, data, **kwargs):
MPLPlot.__init__(self, data, **kwargs)
#kwargs = self.kwargs
#print kwargs
Copy link
Member

Choose a reason for hiding this comment

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

take out these comments

@zachcp
Copy link
Author

zachcp commented Sep 26, 2013

@cpcloud

Thanks for your extensive comments. I tried to address all of them although the choice of some of the defualts around subplotting I simply copied from another Class (Line or Bar , I forget which) - so I didn't really think through the behavior there.

Can I bug you about git one more time? To make my changed I made a new branch, scatterplot3, and manually re-added my few commits. I can issue anew pull request from this branch or I can try to rebase this branch, scatterplot2, to master and add my scatterplot3 commits. What do you reccommend?

@cpcloud
Copy link
Member

cpcloud commented Sep 26, 2013

First things first:

  1. Hook up Travis-CI
  2. Write a smoke test in pandas/tests/test_graphics.py as a sanity check (I didn't see one).
  3. If you don't yet have upstream as a remote then add it via git remote add upstream git://github.com/pydata/pandas.git

About git: does scatterplot2 have any changes that you need? Or are they all in scatterplot3?

@zachcp
Copy link
Author

zachcp commented Sep 26, 2013

All the code is in scatterplot3 except for the comments. I'll take a lookat some of the other graphics tests and make a new one for scatterplots.

@cpcloud
Copy link
Member

cpcloud commented Sep 26, 2013

If all of your code is in scatterplot3 then do this:

git fetch upstream
git checkout scatterplot2
git reset upstream/master..  # reset everything back to, but not including, your current upstream/master
git stash  # just in case you need something that you forgot :)
git rebase upstream/master
git merge scatterplot3

# if all goes well
git stash drop stash@{0}
git branch -D scatterplot3
git push --force

@cpcloud
Copy link
Member

cpcloud commented Sep 26, 2013

Assuming you've set up your Travis-CI hook before doing all of that, it should subsequently run the test suite pretty soon after you run git push --force

@@ -420,37 +420,6 @@ def test_explicit_label(self):
self.assertEqual(ax.xaxis.get_label().get_text(), 'LABEL')

@slow
def test_plot_xy(self):
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this should have been removed?

@zachcp
Copy link
Author

zachcp commented Sep 30, 2013

@jorisvandenbossche Thanks for the code review, however, this branch should be closed. The updated code is in #3473. This PR should be closed/deleted.

@zachcp zachcp closed this Sep 30, 2013
@jorisvandenbossche
Copy link
Member

@zachcp OK!

@zachcp zachcp deleted the scatterplot2 branch April 9, 2014 16:00
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