IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Drop docutils 0.11 support

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-08-24 22:01:41 +09:00
parent 9412bd76b7
commit 98a9b50c52
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -8,6 +8,7 @@ Incompatible changes
--------------------
* Drop python 2.7 and 3.4 support
* Drop docutils 0.11 support
Deprecated
----------

2
setup.py
View File

@ -19,7 +19,7 @@ install_requires = [
'six>=1.5',
'Jinja2>=2.3',
'Pygments>=2.0',
'docutils>=0.11',
'docutils>=0.12',
'snowballstemmer>=1.1',
'babel>=1.3,!=2.0',
'alabaster>=0.7,<0.8',

6
sphinx/writers/manpage.py
View File

@ -11,12 +11,10 @@
from docutils import nodes
from docutils.writers.manpage import (
MACRO_DEF,
Writer,
Translator as BaseTranslator
)
import sphinx.util.docutils
from sphinx import addnodes
from sphinx.locale import admonitionlabels, _
from sphinx.util import logging
@ -113,10 +111,6 @@ class ManualPageTranslator(BaseTranslator):
self._docinfo['version'] = builder.config.version
self._docinfo['manual_group'] = builder.config.project
# In docutils < 0.11 self.append_header() was never called
if sphinx.util.docutils.__version_info__ < (0, 11):
self.body.append(MACRO_DEF)
# Overwrite admonition label translations with our own
for label, translation in admonitionlabels.items():
self.language.labels[label] = self.deunicode(translation)

5
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
minversion = 2.0
envlist = docs,flake8,mypy,coverage,py{35,36,37,38,py},du{11,12,13,14}
envlist = docs,flake8,mypy,coverage,py{35,36,37,38,py},du{12,13,14}
[testenv]
usedevelop = True
@ -8,7 +8,7 @@ passenv =
https_proxy http_proxy no_proxy PERL PERL5LIB PYTEST_ADDOPTS EPUBCHECK_PATH
description =
py{35,36,37,38,py}: Run unit tests against {envname}.
du{11,12,13,14}: Run unit tests with the given version of docutils.
du{12,13,14}: Run unit tests with the given version of docutils.
# TODO(stephenfin) Replace this with the 'extras' config option when tox 2.4 is
# widely available, likely some time after the Ubuntu 18.04 release
@ -16,7 +16,6 @@ description =
# https://tox.readthedocs.io/en/latest/config.html#confval-extras=MULTI-LINE-LIST
deps =
.[test,websupport]
du11: docutils==0.11
du12: docutils==0.12
du13: docutils==0.13.1
du14: docutils==0.14