Skip to content
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

pep8 fixes in animation.py #2057

Merged
merged 1 commit into from May 24, 2013
Merged

Conversation

tacaswell
Copy link
Member

mostly white space

one has_key -> in

@pelson
Copy link
Member

pelson commented May 24, 2013

L32 & L635 - are comments so it's fine to wrap over multiple lines.

Then you can take pleasure in making the matplotlib.tests.test_coding_standards fail and remove the appropriate line 😉.

@tacaswell
Copy link
Member Author

I had my pep8 checker being a bit too strict, oh well.

That was kinda fun.

The first build failure was matplotlib.tests.test_bbox_tight.test_bbox_inches_tight_suptile_legend.test again on 2.6 and the second one is a pip install issue on 3.2

@pelson
Copy link
Member

pelson commented May 24, 2013

This is 👍 @tacaswell. I think we may as well squash this commit and then I'll merge.

FWIW, I had a bit of fun this morning removing lots of files 😄 : https://github.com/matplotlib/matplotlib/pull/2059/files#diff-11

@tacaswell
Copy link
Member Author

What is the best way to squash the commit? I have actually never done that before.

@pelson
Copy link
Member

pelson commented May 24, 2013

The best article I've seen: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

in summary:

git rebase -i HEAD~3

@tacaswell
Copy link
Member Author

squashed (and passes all the tests this time!)

pelson added a commit that referenced this pull request May 24, 2013
@pelson pelson merged commit 2cc7e21 into matplotlib:master May 24, 2013
@tacaswell tacaswell deleted the animation_pep8 branch May 24, 2013 19:08
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.

None yet

2 participants