/matplotlib

Fix sphinx 1.4.0 issues #6238

Merged
merged 4 commits into from Mar 30, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  v1.5.2
3 participants
@jenshnielsen @mdboom @tacaswell
@jenshnielsen
Owner

jenshnielsen commented Mar 29, 2016

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.

jenshnielsen added some commits Mar 29, 2016

@jenshnielsen jenshnielsen Make mpl_examples+sections a list not a tuple. 
Other parts of the code overwrites this with a list, fixes one sphinx warning with sphinx 1.4.0
 14b1cdb
@jenshnielsen jenshnielsen Only add nodes once in mathmpl extension. 
Fixes sphinx warnings
 53489b2
@jenshnielsen jenshnielsen Docs Only add nodes once in only directives 
Fix more sphinx warnings
 2917fab
@jenshnielsen jenshnielsen Docs should now build with Sphinx 1.4.0

All checks have passed

2 successful checks
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
7f18df6

mdboom added the needs_review label Mar 29, 2016

@jenshnielsen
Owner

jenshnielsen commented Mar 29, 2016

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

jenshnielsen commented Mar 29, 2016

Fixes #6235
@mdboom
Owner

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 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
2 checks passed

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

tacaswell removed the needs_review label Mar 30, 2016

@tacaswell tacaswell added a commit that referenced this pull request Mar 30, 2016

@tacaswell tacaswell Merge pull request #6238 from jenshnielsen/fixsphinx140issues 
Fix sphinx 1.4.0 issues

Conflicts:
    .travis.yml
        Reject all changes
 3a944a6
@tacaswell
Owner

tacaswell commented Mar 30, 2016

backported to v1.5.1-doc as 3a944a6

jenshnielsen deleted the jenshnielsen:fixsphinx140issues branch Mar 30, 2016

@bearstrong bearstrong added a commit to bearstrong/matplotlib that referenced this pull request Apr 1, 2016

@tacaswell @bearstrong tacaswell + bearstrong Merge pull request #6238 from jenshnielsen/fixsphinx140issues 
Fix sphinx 1.4.0 issues

Conflicts:
    .travis.yml
        Reject all changes
 5fad52f

This was referenced May 10, 2016

Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment