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

Doc build fixes #5288

Merged
merged 5 commits into from Oct 22, 2015
Merged

Doc build fixes #5288

merged 5 commits into from Oct 22, 2015

Conversation

mdboom
Copy link
Member

@mdboom mdboom commented Oct 20, 2015

Fixes some warnings in the doc build.

Also renames PIL -> pillow in documentation and error messages. (Code should continue to import from PIL).

@mdboom mdboom added this to the next point release (1.5.0) milestone Oct 20, 2015
@@ -13,7 +13,7 @@
alignment = {'horizontalalignment': 'center', 'verticalalignment': 'baseline'}
# Show family options

families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
families = ['serif', 'sans-serif', 'monospace']
Copy link
Member

Choose a reason for hiding this comment

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

Any particular reason to drop these. While they may not be the most beautiful fonts Travis does include them correctly here http://matplotlib.org/devdocs/examples/pylab_examples/fonts_demo.html

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah. I removed them just because they give a doc build warning on my machine. But if it works on Travis, might as well reinstate. I'll just revert this change.

Copy link
Member

Choose a reason for hiding this comment

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

I spent some time at some point finding fonts for all the categories that are free and installed on Travis. See the .travis file. Before that it was a bit of a mess

*infile* the image file -- must be PNG or PIL readable if you
have `PIL <http://www.pythonware.com/products/pil/>`_ installed
*infile* the image file -- must be PNG or pillow-readable if you
have `pillow <http://python-pillow.github.io/>`_ installed
Copy link
Member

Choose a reason for hiding this comment

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

Should use https since it redirects there anyway.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not a fan of using https in external links where not strictly necessary.

Copy link
Member

Choose a reason for hiding this comment

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

Is the extra GET and redirect not reason enough?

mdboom added a commit that referenced this pull request Oct 22, 2015
@mdboom mdboom merged commit c78c971 into matplotlib:master Oct 22, 2015
@mdboom
Copy link
Member Author

mdboom commented Oct 22, 2015

Backported to 1.5.x as f03a5b3

mdboom added a commit that referenced this pull request Oct 22, 2015
@mdboom mdboom deleted the doc-build-fixes branch November 10, 2015 02:46
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

3 participants