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

Handle Sphinx 1.3 API change #1424

Merged
merged 5 commits into from Mar 14, 2015

Conversation

blink1073
Copy link
Member

Sphinx changed cfg.source_suffix to be a list in version 1.3.
We were using it as a string.
First, I tried just changing cfg.source_suffix to a string if it was a list, but that affected other parts of the build. Instead, we create a new cfg.source_suffix_str and use that, so we can support all versions of Sphinx.

@blink1073
Copy link
Member Author

@jni, you may just want to take these two lines and add them to #1416.

@jni
Copy link
Member

jni commented Mar 14, 2015

@blink1073 when and if this passes and gets merged (=P), I'll rebase... I like to keep PRs small and self-contained...

@blink1073
Copy link
Member Author

Why sphinx why?!?!?

@tacaswell
Copy link
Contributor

mpl is also having issues. We have pinned to 1.2.3 for now...

cc @jenshnielsen

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.7% when pulling 7d65366 on blink1073:contrast-check-function into d4463ba on scikit-image:master.

@blink1073
Copy link
Member Author

@scikit-image/core, someone please merge this as it is holding up all open PRs.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.7% when pulling 5c6ee95 on blink1073:contrast-check-function into d4463ba on scikit-image:master.

@JDWarner
Copy link
Contributor

Travis is happy, AppVeyor is still queued 4 hours later. I realize it's a free service and resources are limited, but that kind of delay is borderline unusable.

Thanks for the fix @blink1073 - I'm merging this. If Windows ends up having a problem we can deal with that separately.

JDWarner added a commit that referenced this pull request Mar 14, 2015
@JDWarner JDWarner merged commit 3aa767d into scikit-image:master Mar 14, 2015
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

5 participants