* Drop Python-3.2. And now, removing 2to3 mechanism procedure has been completed. Closes #1350.

Pygments-2.0 will drop Python-3.2.
The snowballstemmer package that is referred from sphinx-1.3 (that is merged at pull request #214) has not supported Python-3.2.

We decided to drop the Python-3.2.

see also https://bitbucket.org/birkenfeld/sphinx/pull-request/243/native-py2-py3-support-without-2to3-refs
This commit is contained in:
Takayuki Shimizukawa 2014-05-27 23:17:36 +09:00
parent a335414b81
commit 6746c83a18
5 changed files with 10 additions and 18 deletions

View File

@ -4,7 +4,7 @@ Release 1.3 (in development)
Incompatible changes
--------------------
* Dropped support for Python 2.5 and 3.1.
* Dropped support for Python 2.5, 3.1 and 3.2.
* Dropped support for docutils versions up to 0.9.
* Removed the ``sphinx.ext.oldcmarkup`` extension.
* The deprecated config values ``exclude_trees``, ``exclude_dirnames`` and

View File

@ -41,16 +41,13 @@ Among its features are the following:
* Setuptools integration
'''
if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 2):
print('ERROR: Sphinx requires at least Python 2.6 or 3.2 to run.')
if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 3):
print('ERROR: Sphinx requires at least Python 2.6 or 3.3 to run.')
sys.exit(1)
requires = ['six', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1']
if (3, 0) <= sys.version_info < (3, 3):
requires.append('Jinja2>=2.3,<2.7')
else: # 2.6, 2.7, 3.3 or later
requires.append('Jinja2>=2.3')
requires = [
'six', 'Jinja2>=2.3', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1'
]
# Provide a "compile_catalog" command that also creates the translated
# JavaScript files if Babel is available.

View File

@ -43,7 +43,7 @@ if '+' in __version__ or 'pre' in __version__:
def main(argv=sys.argv):
"""Sphinx build "main" command-line entry."""
if (sys.version_info[:3] < (2, 6, 0) or
(3, 0, 0) <= sys.version_info[:3] < (3, 2, 0)):
(3, 0, 0) <= sys.version_info[:3] < (3, 3, 0)):
sys.stderr.write('Error: Sphinx requires at least Python 2.6 to run.\n')
return 1
try:

View File

@ -61,8 +61,8 @@ def teardown_module():
def test_quickstart_inputstrip():
d = {}
answers = {
'Q1': 'Y\r', # input() return with '\r' on Python-3.2.0 for Windows
'Q2': ' Yes \r',
'Q1': 'Y',
'Q2': ' Yes ',
'Q3': 'N',
'Q4': 'N ',
}

View File

@ -1,5 +1,5 @@
[tox]
envlist=py26,py27,py32,py33,py34,pypy,du11,du10
envlist=py26,py27,py33,py34,pypy,du11,du10
[testenv]
deps=
@ -22,11 +22,6 @@ deps=
mock
{[testenv]deps}
[testenv:py32]
deps=
mock
{[testenv]deps}
[testenv:pypy]
deps=
mock