Merge branch 'stable'

waltznetworks · Aug 20, 2016 · 184bede · 184bede
2 parents 3639231 + 938dad8
commit 184bede
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -120,6 +120,19 @@ Release 1.4.6 (in development)
 Bugs fixed
 ----------
 
+
+Release 1.4.6 (released Aug 20, 2016)
+=====================================
+
+Incompatible changes
+--------------------
+
+* #2867: linkcheck builder crashes with six-1.4.  Now Sphinx depends on six-1.5 or
+  later
+
+Bugs fixed
+----------
+
 * applehelp: Sphinx crashes if ``hiutil`` or ``codesign`` commands not found
 * Fix ``make clean`` abort issue when build dir contains regular files like ``DS_Store``.
 * Reduce epubcheck warnings/errors:
@@ -136,6 +149,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)
 =====================================

diff --git a/Makefile b/Makefile
@@ -9,6 +9,7 @@ DONT_CHECK = -i build -i dist -i sphinx/style/jquery.js \
              -i tests/coverage.py -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 tests/roots/test-warnings/undecodable.rst \
              -i sphinx/search/da.py \

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
     sys.exit(1)
 
 requires = [
-    'six>=1.4',
+    'six>=1.5',
     'Jinja2>=2.3',
     'Pygments>=2.0',
     'docutils>=0.11',

diff --git 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: