From e4adcdff622c9660d9667d9b96baf5fd2902e9fe Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Wed, 23 Nov 2016 14:35:58 +0900 Subject: [PATCH 1/3] Fix style-check violations --- sphinx/search/jssplitter.py | 8 ++++---- utils/jssplitter_generator.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sphinx/search/jssplitter.py b/sphinx/search/jssplitter.py index a3bd8b767..9dc0ca6e7 100644 --- a/sphinx/search/jssplitter.py +++ b/sphinx/search/jssplitter.py @@ -1,14 +1,14 @@ - -"""# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- +""" sphinx.search.jssplitter ~~~~~~~~~~~~~~~~~~~~~~~~ Provides Python compatible word splitter to JavaScript + DO NOT EDIT. This is generated by utils/jssplitter_generator.py + :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. - - DO NOT EDIT. This is generated by utils/jssplitter_generator.py """ splitter_code = """ diff --git a/utils/jssplitter_generator.py b/utils/jssplitter_generator.py index 6eef86cc3..e236f00d0 100644 --- a/utils/jssplitter_generator.py +++ b/utils/jssplitter_generator.py @@ -113,17 +113,17 @@ console.log(' ... ok\\n') ''' % js_src -python_src = ''' -"""# -*- coding: utf-8 -*- +python_src = '''# -*- coding: utf-8 -*- +""" sphinx.search.jssplitter ~~~~~~~~~~~~~~~~~~~~~~~~ Provides Python compatible word splitter to JavaScript + DO NOT EDIT. This is generated by utils/jssplitter_generator.py + :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. - - DO NOT EDIT. This is generated by utils/jssplitter_generator.py """ splitter_code = """ From fa302485f3d6b574273030df3e903db135324e72 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Wed, 23 Nov 2016 23:26:12 +0900 Subject: [PATCH 2/3] Bump to 1.4.9 final --- CHANGES | 4 ++-- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 582f7a301..d65497137 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 1.4.9 (in development) -============================== +Release 1.4.9 (released Nov 23, 2016) +===================================== Bugs fixed ---------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 60b42d70e..b05ec91ed 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.4.9+' +__version__ = '1.4.9' __released__ = '1.4.9' # 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 -version_info = (1, 4, 9, 'beta', 1) +version_info = (1, 4, 9, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 41b39b786af2841f74ab1f7dcfa42fe55a669a31 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Wed, 23 Nov 2016 23:36:25 +0900 Subject: [PATCH 3/3] Bump version --- CHANGES | 7 +++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index d65497137..081a22d82 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Release 1.4.10 (in development) +=============================== + +Bugs fixed +---------- + + Release 1.4.9 (released Nov 23, 2016) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index b05ec91ed..7f6dd5e89 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.4.9' -__released__ = '1.4.9' # used when Sphinx builds its own docs +__version__ = '1.4.10+' +__released__ = '1.4.10' # 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 -version_info = (1, 4, 9, 'final', 0) +version_info = (1, 4, 10, 'alpha', 1) package_dir = path.abspath(path.dirname(__file__))