From 92ca8d92b3c7c4119f9f252676150827ac0f276f Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sun, 10 Jan 2016 23:27:11 +0900 Subject: [PATCH 01/11] Fix #1601, #2220: 'any' role breaks extended domains behavior. Affected extensions doesn't support resolve_any_xref and resolve_xref returns problematic node instead of None. sphinxcontrib-httpdomain is one of them. --- CHANGES | 3 +++ sphinx/environment.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index fc3e8e002..de9557ddc 100644 --- a/CHANGES +++ b/CHANGES @@ -47,6 +47,9 @@ Bugs fixed * #2062: Escape characters in doctests are treated incorrectly with Python 2. * #2225: Fix if the option does not begin with dash, linking is not performed * #2226: Fix math is not HTML-encoded when :nowrap: is given (jsmath, mathjax) +* #1601, #2220: 'any' role breaks extended domains behavior. Affected extensions doesn't + support resolve_any_xref and resolve_xref returns problematic node instead of None. + sphinxcontrib-httpdomain is one of them. Release 1.3.3 (released Dec 2, 2015) ==================================== diff --git a/sphinx/environment.py b/sphinx/environment.py index 5d2107299..355901cc9 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -1655,7 +1655,7 @@ class BuildEnvironment: for role in domain.roles: res = domain.resolve_xref(self, refdoc, builder, role, target, node, contnode) - if res: + if res and isinstance(res[0], nodes.Element): results.append(('%s:%s' % (domain.name, role), res)) # now, see how many matches we got... if not results: From bba3f388e96bac2b106d89d51367d2974f70f49c Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 11 Jan 2016 23:01:17 +0900 Subject: [PATCH 02/11] Fix #2229: No warning is given for unknown options --- CHANGES | 1 + sphinx/domains/std.py | 2 ++ tests/test_build_html.py | 9 +++++++++ tests/test_build_latex.py | 9 +++++++++ 4 files changed, 21 insertions(+) diff --git a/CHANGES b/CHANGES index de9557ddc..b1f2a3060 100644 --- a/CHANGES +++ b/CHANGES @@ -50,6 +50,7 @@ Bugs fixed * #1601, #2220: 'any' role breaks extended domains behavior. Affected extensions doesn't support resolve_any_xref and resolve_xref returns problematic node instead of None. sphinxcontrib-httpdomain is one of them. +* #2229: Fix no warning is given for unknown options Release 1.3.3 (released Dec 2, 2015) ==================================== diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index aa15279a0..ade081c70 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -675,6 +675,8 @@ class StandardDomain(Domain): if docname: break else: + env.warn(fromdocname, 'unknown option: %s' % (contnode.astext()), + lineno=node.line) return None return make_refnode(builder, fromdocname, docname, diff --git a/tests/test_build_html.py b/tests/test_build_html.py index 9ab944451..d463cab87 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -38,6 +38,15 @@ with "\\?": b?'here: >>>(\\\\|/)xbb<<<' HTML_WARNINGS = ENV_WARNINGS + """\ %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*' None:\\d+: WARNING: citation not found: missing +%(root)s/markup.txt:158: WARNING: unknown option: &option +%(root)s/markup.txt:395: WARNING: unknown option: headings +%(root)s/markup.txt:395: WARNING: unknown option: objects +%(root)s/markup.txt:395: WARNING: unknown option: modules +%(root)s/markup.txt:395: WARNING: unknown option: classes +%(root)s/markup.txt:400: WARNING: unknown option: JS +%(root)s/markup.txt:401: WARNING: unknown option: C +%(root)s/markup.txt:402: WARNING: unknown option: myobj +%(root)s/markup.txt:403: WARNING: unknown option: n::Array %(root)s/markup.txt:: WARNING: invalid single index entry u'' %(root)s/markup.txt:: WARNING: invalid pair index entry u'' %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; ' diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py index d233c12b8..6049be6fb 100644 --- a/tests/test_build_latex.py +++ b/tests/test_build_latex.py @@ -24,6 +24,15 @@ from test_build_html import ENV_WARNINGS LATEX_WARNINGS = ENV_WARNINGS + """\ +%(root)s/markup.txt:: WARNING: unknown option: &option +%(root)s/markup.txt:: WARNING: unknown option: headings +%(root)s/markup.txt:: WARNING: unknown option: objects +%(root)s/markup.txt:: WARNING: unknown option: modules +%(root)s/markup.txt:: WARNING: unknown option: classes +%(root)s/markup.txt:: WARNING: unknown option: JS +%(root)s/markup.txt:: WARNING: unknown option: C +%(root)s/markup.txt:: WARNING: unknown option: myobj +%(root)s/markup.txt:: WARNING: unknown option: n::Array None:None: WARNING: citation not found: missing None:None: WARNING: no matching candidate for image URI u'foo.\\*' WARNING: invalid pair index entry u'' From b1715eb0b5018e082c675aef9f00a5c0f70734ff Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 12 Jan 2016 01:09:23 +0900 Subject: [PATCH 03/11] Fix broken test by bba3f388e96bac2b106d89d51367d2974f70f49c --- tests/test_build_texinfo.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py index 618d79015..e06d362a0 100644 --- a/tests/test_build_texinfo.py +++ b/tests/test_build_texinfo.py @@ -23,6 +23,15 @@ from test_build_html import ENV_WARNINGS TEXINFO_WARNINGS = ENV_WARNINGS + """\ +%(root)s/markup.txt:: WARNING: unknown option: &option +%(root)s/markup.txt:: WARNING: unknown option: headings +%(root)s/markup.txt:: WARNING: unknown option: objects +%(root)s/markup.txt:: WARNING: unknown option: modules +%(root)s/markup.txt:: WARNING: unknown option: classes +%(root)s/markup.txt:: WARNING: unknown option: JS +%(root)s/markup.txt:: WARNING: unknown option: C +%(root)s/markup.txt:: WARNING: unknown option: myobj +%(root)s/markup.txt:: WARNING: unknown option: n::Array None:None: WARNING: citation not found: missing None:None: WARNING: no matching candidate for image URI u'foo.\\*' None:None: WARNING: no matching candidate for image URI u'svgimg.\\*' From ca896755a94ccbc7b5fc4eda924716a7b3db4bfa Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 12 Jan 2016 13:35:52 +0900 Subject: [PATCH 04/11] Fix #2229, any-role and ``-W`` option are conflicted --- sphinx/domains/std.py | 5 ++--- tests/test_build_html.py | 8 -------- tests/test_build_latex.py | 10 +--------- tests/test_build_texinfo.py | 10 +--------- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index ade081c70..6e132e539 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -453,7 +453,7 @@ class StandardDomain(Domain): 'productionlist': ProductionList, } roles = { - 'option': OptionXRefRole(), + 'option': OptionXRefRole(warn_dangling=True), 'envvar': EnvVarXRefRole(), # links to tokens in grammar productions 'token': XRefRole(), @@ -491,6 +491,7 @@ class StandardDomain(Domain): 'the label must precede a section header)', 'numref': 'undefined label: %(target)s', 'keyword': 'unknown keyword: %(target)s', + 'option': 'unknown option: %(target)s', } def clear_doc(self, docname): @@ -675,8 +676,6 @@ class StandardDomain(Domain): if docname: break else: - env.warn(fromdocname, 'unknown option: %s' % (contnode.astext()), - lineno=node.line) return None return make_refnode(builder, fromdocname, docname, diff --git a/tests/test_build_html.py b/tests/test_build_html.py index d463cab87..18f0e8c29 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -39,14 +39,6 @@ HTML_WARNINGS = ENV_WARNINGS + """\ %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*' None:\\d+: WARNING: citation not found: missing %(root)s/markup.txt:158: WARNING: unknown option: &option -%(root)s/markup.txt:395: WARNING: unknown option: headings -%(root)s/markup.txt:395: WARNING: unknown option: objects -%(root)s/markup.txt:395: WARNING: unknown option: modules -%(root)s/markup.txt:395: WARNING: unknown option: classes -%(root)s/markup.txt:400: WARNING: unknown option: JS -%(root)s/markup.txt:401: WARNING: unknown option: C -%(root)s/markup.txt:402: WARNING: unknown option: myobj -%(root)s/markup.txt:403: WARNING: unknown option: n::Array %(root)s/markup.txt:: WARNING: invalid single index entry u'' %(root)s/markup.txt:: WARNING: invalid pair index entry u'' %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; ' diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py index 6049be6fb..7b6ce6d14 100644 --- a/tests/test_build_latex.py +++ b/tests/test_build_latex.py @@ -24,15 +24,7 @@ from test_build_html import ENV_WARNINGS LATEX_WARNINGS = ENV_WARNINGS + """\ -%(root)s/markup.txt:: WARNING: unknown option: &option -%(root)s/markup.txt:: WARNING: unknown option: headings -%(root)s/markup.txt:: WARNING: unknown option: objects -%(root)s/markup.txt:: WARNING: unknown option: modules -%(root)s/markup.txt:: WARNING: unknown option: classes -%(root)s/markup.txt:: WARNING: unknown option: JS -%(root)s/markup.txt:: WARNING: unknown option: C -%(root)s/markup.txt:: WARNING: unknown option: myobj -%(root)s/markup.txt:: WARNING: unknown option: n::Array +None:None: WARNING: unknown option: &option None:None: WARNING: citation not found: missing None:None: WARNING: no matching candidate for image URI u'foo.\\*' WARNING: invalid pair index entry u'' diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py index e06d362a0..5137cfbac 100644 --- a/tests/test_build_texinfo.py +++ b/tests/test_build_texinfo.py @@ -23,15 +23,7 @@ from test_build_html import ENV_WARNINGS TEXINFO_WARNINGS = ENV_WARNINGS + """\ -%(root)s/markup.txt:: WARNING: unknown option: &option -%(root)s/markup.txt:: WARNING: unknown option: headings -%(root)s/markup.txt:: WARNING: unknown option: objects -%(root)s/markup.txt:: WARNING: unknown option: modules -%(root)s/markup.txt:: WARNING: unknown option: classes -%(root)s/markup.txt:: WARNING: unknown option: JS -%(root)s/markup.txt:: WARNING: unknown option: C -%(root)s/markup.txt:: WARNING: unknown option: myobj -%(root)s/markup.txt:: WARNING: unknown option: n::Array +None:None: WARNING: unknown option: &option None:None: WARNING: citation not found: missing None:None: WARNING: no matching candidate for image URI u'foo.\\*' None:None: WARNING: no matching candidate for image URI u'svgimg.\\*' From 8ea92359baecc8a54f6b86023658958b47e40656 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 12 Jan 2016 13:36:12 +0900 Subject: [PATCH 05/11] Fix warnings in CHANGES and docs --- CHANGES | 11 +++++------ doc/config.rst | 4 ++-- doc/ext/graphviz.rst | 4 ++-- doc/ext/math.rst | 4 ++-- doc/intl.rst | 2 +- doc/tutorial.rst | 5 +++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CHANGES b/CHANGES index b1f2a3060..54ea9694c 100644 --- a/CHANGES +++ b/CHANGES @@ -943,13 +943,12 @@ Features added * Command-line interfaces: - PR#75: Added ``--follow-links`` option to sphinx-apidoc. - - #869: sphinx-build now has the option :option:`-T` for printing the full + - #869: sphinx-build now has the option ``-T`` for printing the full traceback after an unhandled exception. - - sphinx-build now supports the standard :option:`--help` and - :option:`--version` options. + - sphinx-build now supports the standard ``--help`` and ``--version`` options. - sphinx-build now provides more specific error messages when called with invalid options or arguments. - - sphinx-build now has a verbose option :option:`-v` which can be repeated for + - sphinx-build now has a verbose option ``-v`` which can be repeated for greater effect. A single occurrence provides a slightly more verbose output than normal. Two or more occurrences of this option provides more detailed output which may be useful for debugging. @@ -971,7 +970,7 @@ Features added stemming routines. Saves about 20 seconds when building the Python documentation. - PR#108: Add experimental support for parallel building with a new - :option:`-j` option. + :option:`sphinx-build -j` option. Documentation ------------- @@ -1561,7 +1560,7 @@ Features added * General: - Added a "nitpicky" mode that emits warnings for all missing - references. It is activated by the :option:`-n` command-line switch + references. It is activated by the :option:`sphinx-build -n` command-line switch or the `nitpicky` config value. - Added ``latexpdf`` target in quickstart Makefile. diff --git a/doc/config.rst b/doc/config.rst index 3fd1df658..086e0dc0d 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -234,7 +234,7 @@ General configuration If true, Sphinx will warn about *all* references where the target cannot be found. Default is ``False``. You can activate this mode temporarily using - the :option:`-n` command-line switch. + the :option:`-n ` command-line switch. .. versionadded:: 1.0 @@ -580,7 +580,7 @@ that use Sphinx's HTMLWriter class. A dictionary of values to pass into the template engine's context for all pages. Single values can also be put in this dictionary using the - :option:`-A` command-line option of ``sphinx-build``. + :option:`-A ` command-line option of ``sphinx-build``. .. versionadded:: 0.5 diff --git a/doc/ext/graphviz.rst b/doc/ext/graphviz.rst index ef57da4fd..db7fe7ea6 100644 --- a/doc/ext/graphviz.rst +++ b/doc/ext/graphviz.rst @@ -97,8 +97,8 @@ There are also these new config values: Since this setting is not portable from system to system, it is normally not useful to set it in ``conf.py``; rather, giving it on the - :program:`sphinx-build` command line via the :option:`-D` option should be - preferable, like this:: + :program:`sphinx-build` command line via the :option:`-D ` + option should be preferable, like this:: sphinx-build -b html -D graphviz_dot=C:\graphviz\bin\dot.exe . _build/html diff --git a/doc/ext/math.rst b/doc/ext/math.rst index 4c1546109..a2499324c 100644 --- a/doc/ext/math.rst +++ b/doc/ext/math.rst @@ -117,8 +117,8 @@ built: Since this setting is not portable from system to system, it is normally not useful to set it in ``conf.py``; rather, giving it on the - :program:`sphinx-build` command line via the :option:`-D` option should be - preferable, like this:: + :program:`sphinx-build` command line via the :option:`-D ` + option should be preferable, like this:: sphinx-build -b html -D pngmath_latex=C:\tex\latex.exe . _build/html diff --git a/doc/intl.rst b/doc/intl.rst index a358c436a..bd4f9e889 100644 --- a/doc/intl.rst +++ b/doc/intl.rst @@ -63,7 +63,7 @@ be translated you need to follow these instructions: msgfmt "usage.po" -o "locale/es/LC_MESSAGES/usage.mo" * Set :confval:`locale_dirs` to ``["locale/"]``. -* Set :confval:`language` to ``es`` (also possible via :option:`-D`). +* Set :confval:`language` to ``es`` (also possible via :option:`-D `). * Run your desired build. diff --git a/doc/tutorial.rst b/doc/tutorial.rst index 95bd61ebc..385746f72 100644 --- a/doc/tutorial.rst +++ b/doc/tutorial.rst @@ -122,8 +122,9 @@ this:: $ sphinx-build -b html sourcedir builddir where *sourcedir* is the :term:`source directory`, and *builddir* is the -directory in which you want to place the built documentation. The :option:`-b` -option selects a builder; in this example Sphinx will build HTML files. +directory in which you want to place the built documentation. +The :option:`-b ` option selects a builder; in this example +Sphinx will build HTML files. |more| See :ref:`invocation` for all options that :program:`sphinx-build` supports. From 9dc74f50ae5078a808bd7c8544a0ac84883b0d44 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 12 Jan 2016 22:29:28 +0900 Subject: [PATCH 06/11] remove a duplicated line in CHANGES. --- CHANGES | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES b/CHANGES index 54ea9694c..ae25291d9 100644 --- a/CHANGES +++ b/CHANGES @@ -105,7 +105,6 @@ Bugs fixed * #1923: Use babel features only if the babel latex element is nonempty. * #1942: Fix a KeyError in websupport. * #1903: Fix strange id generation for glossary terms. -* #1796, On py3, automated .mo building cause UnicodeDecodeError * ``make text`` will crush if a definition list item has more than 1 classifiers as: ``term : classifier1 : classifier2``. * #1855: make gettext generates broken po file for definition lists with classifier. From c6b9d3a494f11427ce3497b59982dc67f51a007b Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 12 Jan 2016 22:48:56 +0900 Subject: [PATCH 07/11] tiny fix --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ae25291d9..27eac7f78 100644 --- a/CHANGES +++ b/CHANGES @@ -134,7 +134,7 @@ Bugs fixed Suzumizaki. * #1818: `sphinx.ext.todo` directive generates broken html class attribute as 'admonition-' when :confval:`language` is specified with non-ASCII linguistic area like - 'ru' or 'ja'. To fix this, now ``todo`` directive can use ```:class:`` option. + 'ru' or 'ja'. To fix this, now ``todo`` directive can use ``:class:`` option. * #2140: Fix footnotes in table has broken in LaTeX * #2127: MecabBinder for html searching feature doesn't work with Python 3. Thanks to Tomoko Uchida. From 8bd5b2256144190abea4247d3ff8cd5563a310a6 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 12 Jan 2016 23:47:25 +0900 Subject: [PATCH 08/11] accept 95 chars including CRLF. It is same as flake8 check. --- utils/check_sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/check_sources.py b/utils/check_sources.py index 447c3a637..0538b1116 100755 --- a/utils/check_sources.py +++ b/utils/check_sources.py @@ -57,7 +57,7 @@ if sys.version_info < (3, 0): def check_style_and_encoding(fn, lines): encoding = 'ascii' for lno, line in enumerate(lines): - if len(line) > 95: + if len(line.rstrip('\n')) > 95: yield lno+1, "line too long" if lno < 2: co = coding_re.search(line) From d33b32323f99662f904598d4d454dac3b6c947fc Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 12 Jan 2016 23:53:45 +0900 Subject: [PATCH 09/11] 95 chars in line. It was warned by `make check`. --- sphinx/writers/manpage.py | 6 ++++-- tests/test_build_latex.py | 9 ++++++--- tests/test_util.py | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py index 30e77165f..482b60596 100644 --- a/sphinx/writers/manpage.py +++ b/sphinx/writers/manpage.py @@ -43,9 +43,11 @@ class NestedInlineTransform(object): Flatten nested inline nodes: Before: - foo=1&bar=2 + foo=1 + &bar=2 After: - foo=var&bar=2 + foo=var + &bar=2 """ def __init__(self, document): self.document = document diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py index 7b6ce6d14..ac843c897 100644 --- a/tests/test_build_latex.py +++ b/tests/test_build_latex.py @@ -391,7 +391,8 @@ def test_latex_show_urls_is_footnote(app, status, warning): '\\leavevmode\\footnotetext[7]{\nhttp://sphinx-doc.org/\n}\nDescription' in result) assert ('\\item[{Footnote in term \\protect\\footnotemark[9]}] ' '\\leavevmode\\footnotetext[9]{\nFootnote in term\n}\nDescription' in result) - assert ('\\item[{\\href{http://sphinx-doc.org/}{Term in deflist}\\protect\\footnotemark[8]}] ' + assert ('\\item[{\\href{http://sphinx-doc.org/}{Term in deflist}\\protect' + '\\footnotemark[8]}] ' '\\leavevmode\\footnotetext[8]{\nhttp://sphinx-doc.org/\n}\nDescription' in result) assert ('\\href{https://github.com/sphinx-doc/sphinx}' '{https://github.com/sphinx-doc/sphinx}\n' in result) @@ -431,9 +432,11 @@ def test_image_in_section(app, status, warning): print(result) print(status.getvalue()) print(warning.getvalue()) - assert ('\chapter[Test section]{\includegraphics[width=15pt,height=15pt]{{pic}.png} Test section}' + assert ('\chapter[Test section]' + '{\includegraphics[width=15pt,height=15pt]{{pic}.png} Test section}' in result) - assert ('\chapter[Other {[}blah{]} section]{Other {[}blah{]} \includegraphics[width=15pt,height=15pt]{{pic}.png} section}' in result) + assert ('\chapter[Other {[}blah{]} section]{Other {[}blah{]} ' + '\includegraphics[width=15pt,height=15pt]{{pic}.png} section}' in result) assert ('\chapter{Another section}' in result) diff --git a/tests/test_util.py b/tests/test_util.py index 3d30b6fe0..b0bca861f 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -15,7 +15,8 @@ def test_encode_uri(): expected = (u'https://ru.wikipedia.org/wiki/%D0%A1%D0%B8%D1%81%D1%82%D0%B5%D0%BC%D0%B0_' u'%D1%83%D0%BF%D1%80%D0%B0%D0%B2%D0%BB%D0%B5%D0%BD%D0%B8%D1%8F_' u'%D0%B1%D0%B0%D0%B7%D0%B0%D0%BC%D0%B8_%D0%B4%D0%B0%D0%BD%D0%BD%D1%8B%D1%85') - uri = u'https://ru.wikipedia.org/wiki/Система_управления_базами_данных' + uri = (u'https://ru.wikipedia.org/wiki' + u'/Система_управления_базами_данных') assert expected, encode_uri(uri) expected = (u'https://github.com/search?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+is%3A' From 8e7107b1a2d0fa55a5b81bb95073e8ab4dfa971b Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 12 Jan 2016 23:57:44 +0900 Subject: [PATCH 10/11] Bump to 1.3.4 final --- CHANGES | 4 ++-- sphinx/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 27eac7f78..7ba27dc2e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 1.3.4 (in development) -============================== +Release 1.3.4 (released Jan 12, 2016) +===================================== Bugs fixed ---------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 0e6881df5..d159c2729 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.3.3+' -__released__ = '1.3.3+' # used when Sphinx builds its own docs +__version__ = '1.3.4' +__released__ = '1.3.4' # 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, 3, 4, 'beta', 1) +version_info = (1, 3, 4, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 9b45d10abd0e7dca72c564b54bb02ab880e96d18 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Wed, 13 Jan 2016 00:10:58 +0900 Subject: [PATCH 11/11] bump version --- CHANGES | 7 +++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 7ba27dc2e..ea325dc56 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Release 1.3.5 (in development) +============================== + +Bugs fixed +---------- + + Release 1.3.4 (released Jan 12, 2016) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index d159c2729..0ad54f524 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.3.4' -__released__ = '1.3.4' # used when Sphinx builds its own docs +__version__ = '1.3.4+' +__released__ = '1.3.4+' # 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, 3, 4, 'final', 0) +version_info = (1, 3, 5, 'beta', 1) package_dir = path.abspath(path.dirname(__file__))