diff --git a/.travis.yml b/.travis.yml index d07531261..fc76ab89c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ cache: python: - "2.6" - "2.7" - - "3.3" - "3.4" - "3.5" - "3.5-dev" diff --git a/CHANGES b/CHANGES index ca5ef0e76..b2bea1dae 100644 --- a/CHANGES +++ b/CHANGES @@ -46,6 +46,7 @@ Incompatible changes * Fix ``epub`` and ``epub3`` builders that contained links to ``genindex`` even if ``epub_use_index = False``. * `html_translator_class` is now deprecated. Use `Sphinx.set_translator()` API instead. +* Drop python 3.3 support Features added -------------- diff --git a/doc/install.rst b/doc/install.rst index a2aeaf9cb..16afc490c 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -80,7 +80,7 @@ sidebar and under "Quick Links", click "Windows Installer" to download. .. note:: Currently, Python offers two major versions, 2.x and 3.x. Sphinx 1.3 can run - under Python 2.6, 2.7, 3.3, 3.4, with the recommended version being + under Python 2.6, 2.7, 3.4, 3.5, with the recommended version being 2.7. This chapter assumes you have installed Python 2.7. Follow the Windows installer for Python. diff --git a/doc/intro.rst b/doc/intro.rst index ae3ec0b33..1c3a01cf7 100644 --- a/doc/intro.rst +++ b/doc/intro.rst @@ -54,7 +54,7 @@ See the :ref:`pertinent section in the FAQ list `. Prerequisites ------------- -Sphinx needs at least **Python 2.6** or **Python 3.3** to run, as well as the +Sphinx needs at least **Python 2.6** or **Python 3.4** to run, as well as the docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.10 or some (not broken) SVN trunk snapshot. If you like to have source code highlighting support, you must also install the Pygments_ library. diff --git a/setup.py b/setup.py index 88e1a722f..e583ea84b 100644 --- a/setup.py +++ b/setup.py @@ -37,8 +37,8 @@ Among its features are the following: * Setuptools integration ''' -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.') +if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 4): + print('ERROR: Sphinx requires at least Python 2.6 or 3.4 to run.') sys.exit(1) requires = [ diff --git a/sphinx/__init__.py b/sphinx/__init__.py index e28316f8d..86eec8a9a 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -54,8 +54,8 @@ def main(argv=sys.argv): def build_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, 3, 0)): - sys.stderr.write('Error: Sphinx requires at least Python 2.6 or 3.3 to run.\n') + (3, 0, 0) <= sys.version_info[:3] < (3, 4, 0)): + sys.stderr.write('Error: Sphinx requires at least Python 2.6 or 3.4 to run.\n') return 1 try: from sphinx import cmdline diff --git a/tox.ini b/tox.ini index 9b1b2d7e1..58632f7fb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=flake8,py26,py27,py33,py34,py35,pypy,du12,du11,du10 +envlist=flake8,py26,py27,py34,py35,pypy,du12,du11,du10 [testenv] deps=