Fix issue with Sphinx 1.3.4 #5872
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks like there is another issue with Sphinx 1.3.4 I will take a look tomorrow |
|
It looks like that was as simple as removing the :option: key |
|
I think the docs changes should be backported to 1.5.2 but the changes to Travis might not be wort it to backport |
|
BTW it would be good to convert the rest of that file to numpydoc/napoleon too |
|
There seems to be an issue with downloading the Cursive font from Googles github account. I should fix that before merging |
281c2e8 to
92f8c06
Compare
Ensures that we always get the latest version so we spot issues early. The speedup of the wheelhouse is minimal for these packages which are mainly pure python anyway and we are useing the wheel cache for the ones that are not wheels
…with sphinx 1.3.4
92f8c06 to
7f37443
Compare
|
Looks like the google fonts are back on github so this is ready for review |
tacaswell
added a commit
that referenced
this pull request
Jan 24, 2016
DOC: Fix issue with Sphinx 1.3.4
|
I will cherry pick this back but discard the travis changes |
tacaswell
added a commit
that referenced
this pull request
Jan 24, 2016
DOC: Fix issue with Sphinx 1.3.4 Discarded changes to .travis.yml from #5872
|
backported to 1.5.x as b7dfa4f |
tacaswell
added a commit
to tacaswell/matplotlib
that referenced
this pull request
May 22, 2016
DOC: Fix issue with Sphinx 1.3.4 Discarded changes to .travis.yml from matplotlib#5872
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5869 by rewriting the offending doc string as numpy doc
I also updated .travis.yaml. This originally started with the aim to ensure that the latest version of Sphinx and other dependencies is always installed by only installing Numpy and Pandas from the wheel house. (The wheel house requires manually rebuilding the wheel when a new version is released to pypi and was thus using an older version of Sphinx) The speed benefits are limited since other packages than numpy and pandas are fast to install and we now have the pip wheel cache on Travis anyway.
I took the opportunity to refactor the Travis config a bit more to collect all the pip installs one place and group relevant sections.