From 626be8b5f39aa1777597987cda6d2fcc0818aaf4 Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Thu, 18 Aug 2016 09:34:43 +0200 Subject: [PATCH 1/7] Require six 1.5 for html_parser --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a35c7690bb6..8611fc0082b 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ sys.exit(1) requires = [ - 'six>=1.4', + 'six>=1.5', 'Jinja2>=2.3', 'Pygments>=2.0', 'docutils>=0.11', From caf7e280c2b86c9e374ea99bd87744569beadbb8 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Thu, 18 Aug 2016 18:25:50 +0900 Subject: [PATCH 2/7] Update CHANGES for PR#2867 --- CHANGES | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index de1cb32edb1..cded37f0115 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ Release 1.4.6 (in development) ============================== +Incompatible changes +-------------------- + +* #2867: linkcheck builder crashes with six-1.4. Now Sphinx depends on six-1.5 or + later + Bugs fixed ---------- From 11182d42b1f265cda10951df93098bb3eed5caf7 Mon Sep 17 00:00:00 2001 From: "Erik M. Bray" Date: Thu, 28 Jul 2016 11:53:01 +0200 Subject: [PATCH 3/7] Use a deep copy of the initial_data for a domain so that updates to its internal data structures aren't reflected in initial_data --- sphinx/domains/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sphinx/domains/__init__.py b/sphinx/domains/__init__.py index e4d397efe5b..bee03fce706 100644 --- a/sphinx/domains/__init__.py +++ b/sphinx/domains/__init__.py @@ -10,6 +10,8 @@ :license: BSD, see LICENSE for details. """ +import copy + from six import iteritems from sphinx.errors import SphinxError @@ -145,7 +147,7 @@ def __init__(self, env): self.env = env if self.name not in env.domaindata: assert isinstance(self.initial_data, dict) - new_data = self.initial_data.copy() + new_data = copy.deepcopy(self.initial_data) new_data['version'] = self.data_version self.data = env.domaindata[self.name] = new_data else: From 68b34a354000acbf8933579d8ccb005e083c83b1 Mon Sep 17 00:00:00 2001 From: "Erik M. Bray" Date: Fri, 19 Aug 2016 12:10:38 +0200 Subject: [PATCH 4/7] Add a changelog entry for the fix --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index cded37f0115..740cda9077e 100644 --- a/CHANGES +++ b/CHANGES @@ -26,6 +26,7 @@ Bugs fixed * #2789: `sphinx.ext.intersphinx` generates wrong hyperlinks if the inventory is given * parsing errors for caption of code-blocks are displayed in document (ref: #2845) * #2846: ``singlehtml`` builder does not include figure numbers +* #2816: Fix data from builds cluttering the ``Domain.initial_data`` class attributes Release 1.4.5 (released Jul 13, 2016) ===================================== From be2637f7ff7b8445a5c5918f18d50cb846e44e6c Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 20 Aug 2016 17:57:08 +0900 Subject: [PATCH 5/7] Add testfiles to DONT_CHECK target --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 3b95810333a..adaf9640fad 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ DONT_CHECK = -i build -i dist -i sphinx/style/jquery.js \ -i tests/coverage.py -i env -i utils/convert.py \ -i tests/typing_test_data.py \ -i tests/test_autodoc_py35.py \ + -i tests/roots/test-warnings/undecodable.rst \ -i tests/build \ -i sphinx/search/da.py \ -i sphinx/search/de.py \ From 4168b0bd20da33768a0028f6693ace07fd16f908 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 20 Aug 2016 18:00:04 +0900 Subject: [PATCH 6/7] Bump to 1.4.6 final --- CHANGES | 4 ++-- sphinx/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 740cda9077e..d50bbbf3574 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 1.4.6 (in development) -============================== +Release 1.4.6 (released Aug 20, 2016) +===================================== Incompatible changes -------------------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index b4f8345ec47..ddb5f4954e6 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.4.5+' -__released__ = '1.4.5' # used when Sphinx builds its own docs +__version__ = '1.4.6' +__released__ = '1.4.6' # 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, 6, 'beta', 1) +version_info = (1, 4, 6, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 938dad8400f841c7859b96e23ce72e687ae50467 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 20 Aug 2016 18:05:14 +0900 Subject: [PATCH 7/7] Bump version --- CHANGES | 7 +++++++ sphinx/__init__.py | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index d50bbbf3574..84e6ad140cb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Release 1.4.6 (in development) +============================== + +Bugs fixed +---------- + + Release 1.4.6 (released Aug 20, 2016) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index ddb5f4954e6..83d9f534c66 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,13 +15,13 @@ import sys from os import path -__version__ = '1.4.6' +__version__ = '1.4.6+' __released__ = '1.4.6' # 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, 6, 'final', 0) +version_info = (1, 4, 7, 'beta', 1) package_dir = path.abspath(path.dirname(__file__))