/matplotlib

FIX: sphinx 1.4.0 details #7006

Merged
merged 1 commit into from Aug 30, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  v2.0.0
3 participants
@tacaswell @jenshnielsen @QuLogic
@tacaswell
Owner

tacaswell commented Aug 30, 2016

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

Some checks were not successful

1 failing and 2 successful checks
continuous-integration/appveyor/pr — AppVeyor build failed
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage remained the same at 70.273%
Details
8d3157c

tacaswell added the needs_review label Aug 30, 2016

@jenshnielsen
Owner

jenshnielsen commented Aug 30, 2016

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
Owner

jenshnielsen commented Aug 30, 2016

The appveyor failure is unrelated

@jenshnielsen jenshnielsen merged commit a8555c9 into matplotlib:master Aug 30, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 70.273%
Details

jenshnielsen removed the needs_review label Aug 30, 2016

@jenshnielsen jenshnielsen added a commit that referenced this pull request Aug 30, 2016

@jenshnielsen @jenshnielsen jenshnielsen + jenshnielsen Merge pull request #7006 from tacaswell/fix_bad_sphinx_merge 
FIX: sphinx 1.4.0 details
 0e03ff2
@jenshnielsen
Owner

jenshnielsen commented Aug 30, 2016

Backported to 2.x as 0e03ff2

jenshnielsen referenced this pull request Aug 30, 2016

Merged

Text box widget, take over of PR5375 #6988

QuLogic added this to the 2.0 (style change major release) milestone Aug 30, 2016

tacaswell deleted the tacaswell:fix_bad_sphinx_merge branch Aug 30, 2016

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