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

Import Directive from stdlib in sphinx extension. #2164

Merged
merged 1 commit into from May 30, 2018

Conversation

Projects
None yet
2 participants
@QuLogic
Member

QuLogic commented May 29, 2018

We already do this in the gallery.py extension.

Why was it initiated? Any relevant Issues?

This fixes build against Sphinx 1.7 which removed the deprecated compatibility shims.

PR Checklist

  • Correct base branch selected? master for new features, maintenance_... for bug fixes
  • This PR is not directly related to an existing issue (which has no PR yet).
  • If the PR is making changes to documentation, docs pages can be built automatically.
    Just remove the space in the following string after the + sign: "+DOCS"
  • All tests still pass.
Import Directive from stdlib in sphinx extension.
We already do this in the gallery.py extension.

@QuLogic QuLogic added the docs label May 29, 2018

@QuLogic QuLogic added this to the 1.1.1 milestone May 29, 2018

@QuLogic

This comment has been minimized.

Member

QuLogic commented May 29, 2018

I don't think the doc warnings are my fault? But maybe.

@megies

This comment has been minimized.

Member

megies commented May 29, 2018

I don't think the doc warnings are my fault? But maybe.

No idea, nobody ever got round to fix all those warnings (I started at some point but couldnt get through all of it)

@megies

This comment has been minimized.

Member

megies commented May 29, 2018

And even so.. the docs buildbot is still running on spinx 1.2 so it doesnt say much about the proposed change.

@megies

megies approved these changes May 29, 2018

Looks like our current build bot is fine with this change, so I guess it's good to merge

@megies megies merged commit 8b9847c into obspy:maintenance_1.1.x May 30, 2018

4 of 6 checks passed

docker-deb-buildbot Deb packaging succeeded but tests failed
Details
docs-buildbot Build succeeded, but there are warnings/errors:
Details
ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
docker-testbot Docker tests succeeded
Details

@megies megies deleted the QuLogic:sphinx17 branch May 30, 2018

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