Fix issue #4345: graphics test failure

[nfoti]

closes #4345
The test_time_series_plot_color_with_empty_kwargs method in test_graphics.py uses the matplotlib default color cycle rather than 'r', 'g', and 'b'.

[cpcloud]

can you add release notes doc/source/release.rst and then whatever you add there please put in doc/source/v0.13.0.txt? thanks

[cpcloud]

also can you hook up travis-ci?

[nfoti]

I have no idea how to do that and I don't really have time to do it right now.

[cpcloud]

https://github.com/pydata/pandas/wiki/Testing#hook-up-travis-ci

[nfoti]

I set up Travis and pushed to try to trigger the build but it didn't seem to work.

[cpcloud]

@nfoti no it's building correctly 👌

[cpcloud]

now we just wait to see if it passes

[cpcloud]

here's a link https://travis-ci.org/nfoti/pandas/builds/9479583 if u want 2 watch

[nfoti]

Ah, I was just impatient and it hadn't started yet.

[cpcloud]

btw thanks for setting it up, hope it wasn't too much of a pain

[nfoti]

No problem. The link you sent was very helpful.

On Thu, Jul 25, 2013 at 12:02 PM, Phillip Cloud [email protected]:

btw thanks for setting it up, hope it wasn't too much of a pain

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/4360#issuecomment-21564599
.

[cpcloud]

can you change to self.assertEquals(line_colors, def_colors[:3])? it gives a more informative error message if it fails.

[cpcloud]

@nfoti Can you rebase and squash or fixup to a single commit after you're finished? You can rebase on top of master with

git remote add upstream git://github.com/pydata/pandas.git
git fetch upstream
git rebase upstream/master

Merge conflicts may occur but they will probably just be in release notes or v0.13.0.txt so should be easy to resolve.

Then, to squash/fixup do

git rebase -i upstream/master

Thanks.

[nfoti]

I followed the rebase and fixup instructions. The history is a bit messy though.

[cpcloud]

okay here's some more git to fix up the history

git reset HEAD~4 # go back 4 commits but keep your changes
git stash # put the changes in the stash
git fetch upstream # just to make sure
git reset --hard upstream/master # reset hard to master
git stash pop # put your changes back
git add . # add them
git commit -m'YOUR MESSAGE HERE' # commit the changes
git push --force # force push because you've rewritten history

[cpcloud]

The stash is your (my?) best friend. I use it all the time, especially if I screw something up. Downside: if you don't tightly regulate your stash then you can easily accumulate many pages of stash commits that are so old that you've completely forgotten what those patches were about. Of course, you can always do git stash show -p stash@{stash_number} but that can take a long time for a large # of stashes.

[nfoti]

Thanks for the help. The history looks much better now. I'll read up on
stashes.

On Thu, Jul 25, 2013 at 1:34 PM, Phillip Cloud [email protected]:

The stash is your (my?) best friend. I use it all the time. Downside:
if you don't tightly regulate your stash then you can easily accumulate
many pages of stash commits that are so old that you've completely
forgotten what those patches were about. Of course, you can always do git
stash show -p stash@{stash_number} but that can take a long time for a
large # of stashes.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/4360#issuecomment-21570759
.

[cpcloud]

sure thing

[cpcloud]

@nfoti can you remove these merge conflict markers? they'll make the doc build fail. also in the above file as well
thanks

[nfoti]

Done and I rebased onto upstream/master, but I'm not sure if I did it correctly. Let me know what I need to do to fix the history.

[cpcloud]

history looks ok

[nfoti]

Great! Let me know if you need anything else.

[cpcloud]

@nfoti hey sorry i should've mentioned these as well...

just in general, make sure you get the merge conflict markers out 😄 . in this case after this one you're done

[nfoti]

I removed the conflict markers from the file you mentioned. Sorry that I forgot them there. I rebased onto the new changes and squashed all of my commits into one. I think this does it, unless the conflict markers got reintroduced.

Thanks.

[cpcloud]

you'll need to rebase again

git reset 599e733 # go back to your commit
git reset --hard
git reset HEAD~1 # peel off your commit
git stash # put the changes in the stash
git fetch upstream # just to make sure
git reset --hard upstream/master # reset hard to master
git stash pop # put your changes back
git add . # add them
git commit -m'YOUR MESSAGE HERE' # commit the changes
git push --force # force push because you've rewritten history

[nfoti]

Sorry about that. I've re-rebased and checked that there were no merge
conflict tags remaining.

On Tue, Jul 30, 2013 at 11:57 AM, Phillip Cloud [email protected]:

you'll need to rebase again

git reset 599e733 # go back to your commit
git reset --hard
git reset HEAD~1 # peel off your commit
git stash # put the changes in the stash
git fetch upstream # just to make sure
git reset --hard upstream/master # reset hard to master
git stash pop # put your changes back
git add . # add them
git commit -m'YOUR MESSAGE HERE' # commit the changes
git push --force # force push because you've rewritten history

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/4360#issuecomment-21801389
.

[cpcloud]

@nfoti thanks!