From b7629471e541c5166c4a4da7276aedca3c674c0b Mon Sep 17 00:00:00 2001 From: Takayuki Shimizukawa Date: Mon, 1 Sep 2014 23:16:54 +0900 Subject: [PATCH 1/3] run `make check` and correct errors. --- setup.py | 3 ++- sphinx/ext/autosummary/__init__.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d35c886f1..9872226ee 100644 --- a/setup.py +++ b/setup.py @@ -136,7 +136,8 @@ else: jscatalog = {} for message in catalog: - if any(x[0].endswith(('.js', '.js_t', '.html')) for x in message.locations): + if any(x[0].endswith(('.js', '.js_t', '.html')) + for x in message.locations): msgid = message.id if isinstance(msgid, (list, tuple)): msgid = msgid[0] diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py index 906b3c201..c5c8f1519 100644 --- a/sphinx/ext/autosummary/__init__.py +++ b/sphinx/ext/autosummary/__init__.py @@ -269,12 +269,14 @@ class Autosummary(Directive): # try to also get a source code analyzer for attribute docs try: - documenter.analyzer = ModuleAnalyzer.for_module(documenter.get_real_modname()) + documenter.analyzer = ModuleAnalyzer.for_module( + documenter.get_real_modname()) # parse right now, to get PycodeErrors on parsing (results will # be cached anyway) documenter.analyzer.find_attr_docs() except PycodeError, err: - documenter.env.app.debug('[autodoc] module analyzer failed: %s', err) + documenter.env.app.debug( + '[autodoc] module analyzer failed: %s', err) # no source file -- e.g. for builtin and C modules documenter.analyzer = None From b4620a38887b1195b26e7b2fa5552bbfd2b9f6b7 Mon Sep 17 00:00:00 2001 From: Takayuki Shimizukawa Date: Mon, 1 Sep 2014 23:20:28 +0900 Subject: [PATCH 2/3] Bump to 1.2.3. --- CHANGES | 4 ++-- sphinx/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 13c8d3a70..f0802cc09 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 1.2.3 (in development) -============================== +Release 1.2.3 (released Sep 1, 2014) +==================================== Features added -------------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 023d46467..acee982f7 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,12 +15,12 @@ import sys from os import path -__version__ = '1.2.2+' -__released__ = '1.2.2' # used when Sphinx builds its own docs +__version__ = '1.2.3' +__released__ = '1.2.3' # 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, 2, 2, 'final', 0) +version_info = (1, 2, 3, 'final', 0) package_dir = path.abspath(path.dirname(__file__))