Dropped support for Sphinx<1.6

pull/161/head
Ashley Whetter 5 years ago
parent 00894a959e
commit dfe82ae94e

@ -10,13 +10,7 @@ from docutils import nodes
from sphinx import addnodes
import sphinx.ext.autosummary
from sphinx.util.nodes import nested_parse_with_titles
try:
from sphinx.util.rst import escape
except ImportError:
# sphinx.util.rst is available in sphinx >=1.4.7 only.
# This implementation is taken from sphinx 1.6.5.
def escape(text):
return re.compile(r'([!-/:-@\[-`{-~])').sub(r'\\\1', text)
from sphinx.util.rst import escape
class AutoapiSummary(Directive):

@ -238,10 +238,7 @@ class SphinxMapperBase(object):
files_to_read.append(filename)
if sphinx.version_info >= (1, 6):
status_iterator = sphinx.util.status_iterator
else:
status_iterator = self.app.status_iterator
status_iterator = sphinx.util.status_iterator
for _path in status_iterator(
files_to_read,

@ -280,22 +280,16 @@ class PythonSphinxMapper(SphinxMapperBase):
)
lines = sphinx.util.docstrings.prepare_docstring(obj.docstring)
try:
if lines:
self.app.emit(
'autodoc-process-docstring',
cls.type,
obj.name,
None, # object
None, # options
lines,
)
except KeyError:
if (sphinx.version_info >= (1, 6)
and 'autodoc-process-docstring' in self.app.events.events):
raise
else:
obj.docstring = '\n'.join(lines)
if lines and 'autodoc-process-docstring' in self.app.events.events:
self.app.emit(
'autodoc-process-docstring',
cls.type,
obj.name,
None, # object
None, # options
lines,
)
obj.docstring = '\n'.join(lines)
for child_data in data.get('children', []):
for child_obj in self.create_class(child_data, options=options,

@ -18,7 +18,7 @@ setup(
'astroid;python_version>="3"',
'astroid<2;python_version<"3"',
'PyYAML',
'sphinx',
'sphinx>=1.6',
'sphinxcontrib-golangdomain',
'sphinxcontrib-dotnetdomain',
'unidecode',

@ -77,8 +77,6 @@ class TestSimpleModule(object):
assert 'Foo' in index_file
assert 'Meta' in index_file
@pytest.mark.skipif(sphinx.version_info < (1, 4),
reason="Cannot override extensions in Sphinx 1.3")
def test_napoleon_integration_not_loaded(self, builder):
example_path = '_build/text/autoapi/example/index.txt'
@ -91,8 +89,6 @@ class TestSimpleModule(object):
assert 'Returns' in example_file
@pytest.mark.skipif(sphinx.version_info < (1, 4),
reason="Cannot override extensions in Sphinx 1.3")
def test_napoleon_integration_loaded(builder):
confoverrides = {
'extensions': [

@ -1,6 +1,6 @@
[tox]
envlist =
py{27,34,35,36,37}-sphinx{13,14,15,16,17,18}
py{27,34,35,36,37}-sphinx{16,17,18}
lint
docs
@ -18,9 +18,6 @@ setenv =
deps = -r{toxinidir}/requirements.txt
pytest
mock
sphinx13: Sphinx<1.4
sphinx14: Sphinx<1.5
sphinx15: Sphinx<1.6
sphinx16: Sphinx<1.7
sphinx17: Sphinx<1.8
sphinx18: Sphinx<1.9

Loading…
Cancel
Save