[Python-modules-commits] r34128 - in packages/sphinx/trunk/debian (4 files)

[mitya57 at users.alioth.debian.org]

    Date: Thursday, September 3, 2015 @ 13:56:36
  Author: mitya57
Revision: 34128

* Update reproducibility patches to the latest version from Val Lorentz:
  - Update reproducible_grammar.diff.
  - Make searchindex generation deterministic (reproducible_searchindex.diff).

Added:
  packages/sphinx/trunk/debian/patches/reproducible_searchindex.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/reproducible_grammar.diff
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2015-09-03 13:40:27 UTC (rev 34127)
+++ packages/sphinx/trunk/debian/changelog	2015-09-03 13:56:36 UTC (rev 34128)
@@ -1,3 +1,11 @@
+sphinx (1.3.1-6) UNRELEASED; urgency=medium
+
+  * Update reproducibility patches to the latest version from Val Lorentz:
+    - Update reproducible_grammar.diff.
+    - Make searchindex generation deterministic (reproducible_searchindex.diff).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 03 Sep 2015 16:54:07 +0300
+
 sphinx (1.3.1-5) unstable; urgency=medium
 
   * Fix remaining reproducibility issues (closes: #795976):

Modified: packages/sphinx/trunk/debian/patches/reproducible_grammar.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/reproducible_grammar.diff	2015-09-03 13:40:27 UTC (rev 34127)
+++ packages/sphinx/trunk/debian/patches/reproducible_grammar.diff	2015-09-03 13:56:36 UTC (rev 34128)
@@ -1,19 +1,22 @@
 Description: make grammar generation deterministic
 Author: Val Lorentz <progval at progval.net>
 Forwarded: https://github.com/sphinx-doc/sphinx/pull/2009
-Last-Update: 2015-08-20
+Last-Update: 2015-09-03
 
 --- a/sphinx/pycode/pgen2/pgen.py
 +++ b/sphinx/pycode/pgen2/pgen.py
-@@ -4,6 +4,7 @@
+@@ -4,6 +4,10 @@
  from __future__ import print_function
  
  from six import iteritems
-+from collections import OrderedDict
++try:
++    from collections import OrderedDict
++except ImportError: # Fallback for Python 2.6
++    OrderedDict = dict
  
  # Pgen imports
  
-@@ -57,7 +58,7 @@
+@@ -57,7 +61,7 @@
      def make_first(self, c, name):
          rawfirst = self.first[name]
          first = {}
@@ -22,7 +25,7 @@
              ilabel = self.make_label(c, label)
              ##assert ilabel not in first # X X X failed on <> ... !=
              first[ilabel] = 1
-@@ -138,8 +139,8 @@
+@@ -138,8 +142,8 @@
                  totalset[label] = 1
                  overlapcheck[label] = {label: 1}
          inverse = {}
@@ -33,7 +36,7 @@
                  if symbol in inverse:
                      raise ValueError("rule %s is ambiguous; %s is in the"
                                       " first sets of %s as well as %s" %
-@@ -349,6 +350,9 @@
+@@ -349,6 +353,9 @@
          assert isinstance(next, NFAState)
          self.arcs.append((label, next))
  
@@ -43,7 +46,7 @@
  class DFAState(object):
  
      def __init__(self, nfaset, final):
-@@ -357,7 +361,10 @@
+@@ -357,7 +364,10 @@
          assert isinstance(final, NFAState)
          self.nfaset = nfaset
          self.isfinal = final in nfaset

Added: packages/sphinx/trunk/debian/patches/reproducible_searchindex.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/reproducible_searchindex.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/reproducible_searchindex.diff	2015-09-03 13:56:36 UTC (rev 34128)
@@ -0,0 +1,19 @@
+Description: make searchindex generation deterministic
+Author: Val Lorentz <progval at progval.net>
+Forwarded: https://github.com/sphinx-doc/sphinx/pull/2009
+Last-Update: 2015-09-03
+
+--- a/sphinx/search/__init__.py
++++ b/sphinx/search/__init__.py
+@@ -259,9 +259,9 @@
+         rv = {}
+         otypes = self._objtypes
+         onames = self._objnames
+-        for domainname, domain in iteritems(self.env.domains):
++        for domainname, domain in sorted(iteritems(self.env.domains)):
+             for fullname, dispname, type, docname, anchor, prio in \
+-                    domain.get_objects():
++                    sorted(domain.get_objects()):
+                 # XXX use dispname?
+                 if docname not in fn2index:
+                     continue

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2015-09-03 13:40:27 UTC (rev 34127)
+++ packages/sphinx/trunk/debian/patches/series	2015-09-03 13:56:36 UTC (rev 34128)
@@ -11,3 +11,4 @@
 reproducible_grammar.diff
 reproducible_inventory.diff
 reproducible_js_locale.diff
+reproducible_searchindex.diff