From f414f1c32b9ef23fa56b5f15fa5966eea60bd715 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 10 Dec 2013 10:30:10 +0100 Subject: now it is 1.3 in development --- sphinx/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sphinx/__init__.py') diff --git a/sphinx/__init__.py b/sphinx/__init__.py index e113e1c4..e359ca3e 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,8 +15,8 @@ import sys from os import path -__version__ = '1.2' -__released__ = '1.2' # used when Sphinx builds its own docs +__version__ = '1.3a0' +__released__ = '1.3a0' # used when Sphinx builds its own docs # version info for better programmatic use # possible values for 3rd element: 'alpha', 'beta', 'rc', 'final' # 'final' has 0 as the last element -- cgit v1.2.1 From 3a19adb976393dc4066def880d0db11e2f7378d7 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sun, 15 Dec 2013 14:16:53 +0900 Subject: Drop python-2.5 and remove 2.4,2.5 support codes --- sphinx/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sphinx/__init__.py') diff --git a/sphinx/__init__.py b/sphinx/__init__.py index f93e57a1..bbd45b24 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -42,8 +42,8 @@ if '+' in __version__ or 'pre' in __version__: def main(argv=sys.argv): """Sphinx build "main" command-line entry.""" - if sys.version_info[:3] < (2, 5, 0): - sys.stderr.write('Error: Sphinx requires at least Python 2.5 to run.\n') + if sys.version_info[:3] < (2, 6, 0): + sys.stderr.write('Error: Sphinx requires at least Python 2.6 to run.\n') return 1 try: from sphinx import cmdline -- cgit v1.2.1 From 22bff8279d4d2d0096152337ae2b6b3951f92e29 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sun, 15 Dec 2013 16:25:01 +0900 Subject: Drop docutils-0.7, 0.8 and 0.9 support --- sphinx/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sphinx/__init__.py') diff --git a/sphinx/__init__.py b/sphinx/__init__.py index bbd45b24..7fa3bfe9 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -71,12 +71,12 @@ def main(argv=sys.argv): sys.stderr.write(hint) return 1 raise - if sys.version_info[:3] >= (3, 3, 0): - from sphinx.util.compat import docutils_version - if docutils_version < (0, 10): - sys.stderr.write('Error: Sphinx requires at least ' - 'Docutils 0.10 for Python 3.3 and above.\n') - return 1 + + from sphinx.util.compat import docutils_version + if docutils_version < (0, 10): + sys.stderr.write('Error: Sphinx requires at least Docutils 0.10 to ' + 'run.\n') + return 1 return cmdline.main(argv) -- cgit v1.2.1 From 80a0712b8190ca3d55531a9d1fe3205e364437d1 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sat, 18 Jan 2014 16:30:54 +0900 Subject: Fix: The application now check extra Python versions (3.0, 3.1) to stop invoking. And fix a trivial comment. --- sphinx/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sphinx/__init__.py') diff --git a/sphinx/__init__.py b/sphinx/__init__.py index bbd45b24..2551526f 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -42,7 +42,8 @@ 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): + if (sys.version_info[:3] < (2, 6, 0) or + (3, 0, 0) <= sys.version_info[:3] < (3, 2, 0)): sys.stderr.write('Error: Sphinx requires at least Python 2.6 to run.\n') return 1 try: -- cgit v1.2.1 From 88fe3b0b04f3fff0fce6c9b99d5da73dd5dda880 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 27 May 2014 23:17:36 +0900 Subject: * 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 --- sphinx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sphinx/__init__.py') diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 712bfeca..950eb5ff 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: -- cgit v1.2.1