Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixed typos in matplotlibrc and docs #1600

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

Conversation

kdavies4
Copy link
Contributor

No description provided.

@kdavies4
Copy link
Contributor Author

If it's useful, I can provide the script and custom dictionary I used for spellchecking (using aspell).

@@ -58,12 +58,12 @@ Glossary
<http://en.wikipedia.org/wiki/Portable_Network_Graphics>`_), a raster graphics format
that employs lossless data compression which is more suitable
for line art than the lossy jpg format. Unlike the gif format,
png is not encumbered by requirements for a patent license.
png is not encumbered by erements for a patent license.
Copy link
Member

Choose a reason for hiding this comment

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

This change introduces a typo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm sorry. I'm pushing a change to undo this.

@@ -162,7 +162,7 @@ Pull Requests (123):
* :ghpull:`1074`: Added broadcasting support in some mplot3d methods
Copy link
Member

Choose a reason for hiding this comment

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

I have the sneaking suspicion that this file is automagically generated. @mdboom Do you know where the github stats come from? Presumably you didn't type them all out by hand...

If it's auto-generated then I wonder if these changes will be overwritten in the next release, when we re-generate the github stats.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If so, I'll undo these changes and leave the typos in the history.

Copy link
Member

Choose a reason for hiding this comment

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

Yes -- this file is autogenerated from the git history -- which unfortunately does have these typos, but c'est la vie. Probably best to just not touch this file at all. I should probably put a comment at the top that this file is autogenerated so as to not to waste the time of helpful people like @kdavies4 in the future ;)

@dmcdougall
Copy link
Member

Hmmm, Travis is failing:

============================================================================
Traceback (most recent call last):
  File "setup.py", line 264, in <module>
    open('lib/matplotlib/mpl-data/matplotlibrc', 'w').write(template%rc)
TypeError: not enough arguments for format string


install: 'python setup.py install' returned false.
Done. Build script exited with: 1

@kdavies4
Copy link
Contributor Author

I don't understand why these changes would cause a failure. I don't have experience on this. Do you have suggestions?

@kdavies4
Copy link
Contributor Author

Oh, maybe the double percent (83%%) somehow marked a format string? => "not enough arguments for format string"

@dmcdougall
Copy link
Member

I'm looking into it :) I'll report back shortly.

@dmcdougall
Copy link
Member

@kdavies4 Yes, git bisect indicates you are right. Could you git revert ad298ec and push the new changes?

@kdavies4
Copy link
Contributor Author

I'm sorry--all this trouble to fix a couple of typos.

@dmcdougall
Copy link
Member

Not a problem. That's why we have Travis.

@dmcdougall
Copy link
Member

Will look into the github stats and get back to you.

@dmcdougall
Copy link
Member

@kdavies4 Ok, so there's a script to auto-generate those issue statistics. Though they may or may not be overwritten at the next generation of stats, it's fine to fix them but the typos are embedded in the GitHub issues themselves, not mpl.

@kdavies4 If you could squash this down to a single commit, I'll go ahead and merge this in. Thanks.

@kdavies4
Copy link
Contributor Author

I made a new pull request (#1602) on a new branch. It is the same except it's squashed to one commit.

@kdavies4 kdavies4 closed this Dec 16, 2012
@dmcdougall
Copy link
Member

Thanks @kdavies4, though for future reference you didn't need to create a new branch. Instead, the following would have worked:

$ git checkout typos  # make sure we're on the right branch
$ get rebase -i HEAD~5  # deal with only the last 5 commits

# Your $EDITOR will pop up... follow the instructions in there
# and save-quit when you're done

$ git push --force origin typos  # force push the updated branch

Hope that helps. Thanks for sorting this out.

dmcdougall added a commit that referenced this pull request Dec 16, 2012
Fixed typos in docs (squashed version of #1600)
@kdavies4
Copy link
Contributor Author

Thanks! I was afraid "--force" would mess things up.

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