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

Fix sphinx 1.4.0 issues #6238

Merged
merged 4 commits into from Mar 30, 2016
Merged

Conversation

jenshnielsen
Copy link
Member

It seems like the primary issues were that we added nodes and roles to the sphinx extensions multiple times. However, my understanding of the Sphinx extensions is not particularly great so I may be misunderstanding something.

Other parts of the code overwrites this with a list, fixes one sphinx warning with sphinx 1.4.0
@jenshnielsen
Copy link
Member Author

We may want to backport this to 2.x or possibly 1.5.x?

@jenshnielsen
Copy link
Member Author

Fixes #6235

@mdboom
Copy link
Member

mdboom commented Mar 30, 2016

Seems ok to me, and it makes sense that they would be more strict about adding nodes and directives multiple times.

@tacaswell tacaswell added this to the 1.5.2 (Critical bug fix release) milestone Mar 30, 2016
@tacaswell tacaswell merged commit 1bc63cc into matplotlib:master Mar 30, 2016
tacaswell added a commit that referenced this pull request Mar 30, 2016
Fix sphinx 1.4.0 issues

Conflicts:
    .travis.yml
        Reject all changes
@tacaswell
Copy link
Member

backported to v1.5.1-doc as 3a944a6

@jenshnielsen jenshnielsen deleted the fixsphinx140issues branch March 30, 2016 08:52
bearstrong pushed a commit to bearstrong/matplotlib that referenced this pull request Apr 1, 2016
Fix sphinx 1.4.0 issues

Conflicts:
    .travis.yml
        Reject all changes
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