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 details #7006

Merged
merged 1 commit into from
Aug 30, 2016

Conversation

tacaswell
Copy link
Member

In 10bbf1c which merged parallel
building, the changes from 3a944a6
(which accounted for sphinx 1.4.0 becoming stricter) were discarded.

In 10bbf1c which merged parallel
building, the changes from 3a944a6
(which accounted for sphinx 1.4.0 becoming stricter) were discarded.
@jenshnielsen
Copy link
Member

The failure is also in 2.x this is caused by

  • We are using travis wheel house on 2.x which only has Travis 1.3.x
  • I failed to spot it in the review

@jenshnielsen
Copy link
Member

The appveyor failure is unrelated

@jenshnielsen jenshnielsen merged commit a8555c9 into matplotlib:master Aug 30, 2016
jenshnielsen added a commit that referenced this pull request Aug 30, 2016
@jenshnielsen
Copy link
Member

Backported to 2.x as 0e03ff2

@QuLogic QuLogic added this to the 2.0 (style change major release) milestone Aug 30, 2016
@tacaswell tacaswell deleted the fix_bad_sphinx_merge branch August 30, 2016 12:38
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