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

Don't import obsolete Directive class from Sphinx #50480

Merged
merged 1 commit into from Nov 12, 2018

Conversation

Projects
None yet
2 participants
@terminalmage
Copy link
Contributor

commented Nov 12, 2018

Directive was apparently removed from Sphinx and made part of docutils. For some reason, in this saltdomain extension, we were importing both from docutils and sphinx. This worked well enough while Directive was still only deprecated, but it appears to recently have been removed, meaning that it now just causes an ImportError.

This commit removes the redundant import.

Don't import obsolete Directive class from Sphinx
Directive was apparently removed from Sphinx and made part of docutils.
For some reason, in this saltdomain extension, we were importing both
from docutils and sphinx. This worked well enough while Directive was
still only deprecated, but it appears to recently have been removed,
meaning that it now just causes an ImportError.

This commit removes the redundant import.

@rallytime rallytime merged commit accf681 into saltstack:2017.7 Nov 12, 2018

8 of 10 checks passed

jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:docs branch Nov 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.