diff --git a/CHANGES b/CHANGES index 51462260b..38d53e48e 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/setup.py b/setup.py index 4229c953f..a0004197e 100644 --- a/setup.py +++ b/setup.py @@ -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. diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 712bfeca4..950eb5ffe 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -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: diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py index 901d8ccd9..74deb46d3 100644 --- a/tests/test_quickstart.py +++ b/tests/test_quickstart.py @@ -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 ', } diff --git a/tox.ini b/tox.ini index 47ee49866..0a80ffa33 100644 --- a/tox.ini +++ b/tox.ini @@ -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