[Reproducible-commits] [epydoc] 01/01: extend patch for ordering issues

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch pu/reproducible_builds
in repository epydoc.

commit 8f5779a5661c1731a1875952729019a95cd66426
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Mon May 30 23:19:50 2016 +0000

    extend patch for ordering issues
---
 debian/changelog                        |  7 ++++++
 debian/patches/deterministic-sort.patch | 40 ++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 532409f..531543f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+epydoc (3.0.1+dfsg-12.0~reproducible1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Extend reproducibility patch to address sorting and file order issues.
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Mon, 30 May 2016 21:51:04 +0000
+
 epydoc (3.0.1+dfsg-12) unstable; urgency=medium
 
   * Rename honour_source_date_epoch.patch to source-date.patch
diff --git a/debian/patches/deterministic-sort.patch b/debian/patches/deterministic-sort.patch
index 4b165ec..7d231f7 100644
--- a/debian/patches/deterministic-sort.patch
+++ b/debian/patches/deterministic-sort.patch
@@ -16,9 +16,8 @@ Bug: https://sourceforge.net/p/epydoc/bugs/370/
 Bug-Debian: http://bugs.debian.org/795835
 Forwarded: https://sourceforge.net/p/epydoc/bugs/370/
 Last-Update: 2015-08-17
-diff -u -r epydoc-3.0.1+dfsg.old/epydoc/docwriter/html.py epydoc-3.0.1+dfsg/epydoc/docwriter/html.py
---- epydoc-3.0.1+dfsg.old/epydoc/docwriter/html.py	2015-08-16 18:57:38.152484836 +0000
-+++ epydoc-3.0.1+dfsg/epydoc/docwriter/html.py	2015-08-17 09:59:14.756288022 +0000
+--- a/epydoc/docwriter/html.py
++++ b/epydoc/docwriter/html.py
 @@ -404,6 +404,7 @@
              imports=False, packages=False, bases=False, submodules=False, 
              subclasses=False, private=self._show_private))
@@ -27,7 +26,17 @@ diff -u -r epydoc-3.0.1+dfsg.old/epydoc/docwriter/html.py epydoc-3.0.1+dfsg/epyd
          """The list of L{ModuleDoc}s for the documented modules."""
          self.module_set = set(self.module_list)
          """The set of L{ModuleDoc}s for the documented modules."""
-@@ -1012,7 +1013,8 @@
+@@ -878,7 +879,8 @@
+                     len(doc.subclasses) > 0):
+                     out('<dl><dt>Known Subclasses:</dt>\n<dd>\n    ')
+                     out('  <ul class="subclass-list">\n')
+-                    for i, subclass in enumerate(doc.subclasses):
++                    sort_key = lambda c:tuple(reversed(c.canonical_name))
++                    for i, subclass in enumerate(sorted(set(doc.subclasses), key=sort_key)):
+                         href = self.href(subclass, context=doc)
+                         if self._val_is_public(subclass): css = ''
+                         else: css = ' class="private"'
+@@ -1012,7 +1014,8 @@
                              #class_set.add(base)
   
          out('<ul class="nomargin-top">\n')
@@ -37,7 +46,7 @@ diff -u -r epydoc-3.0.1+dfsg.old/epydoc/docwriter/html.py epydoc-3.0.1+dfsg/epyd
              if doc.bases != UNKNOWN and len(doc.bases)==0:
                  self.write_class_tree_item(out, doc, class_set)
          out('</ul>\n')
-@@ -2817,7 +2819,8 @@
+@@ -2817,7 +2820,8 @@
          >>> # endif
          >>> if doc.subclasses:
              <ul>
@@ -47,4 +56,23 @@ diff -u -r epydoc-3.0.1+dfsg.old/epydoc/docwriter/html.py epydoc-3.0.1+dfsg/epyd
          >>>     if subclass in class_set:
          >>>       self.write_class_tree_item(out, subclass, class_set)
          >>>     #endif
-
+--- a/epydoc/docbuilder.py
++++ b/epydoc/docbuilder.py
+@@ -574,7 +574,7 @@
+     subpackage_dirs = set()
+     for subdir in pkg_path:
+         if os.path.isdir(subdir):
+-            for name in os.listdir(subdir):
++            for name in sorted(os.listdir(subdir)):
+                 filename = os.path.join(subdir, name)
+                 # Is it a valid module filename?
+                 if is_module_file(filename):
+@@ -660,7 +660,7 @@
+         num_items = 0
+         
+         if is_package_dir(package_dir):
+-            for name in os.listdir(package_dir):
++            for name in sorted(os.listdir(package_dir)):
+                 filename = os.path.join(package_dir, name)
+                 if is_module_file(filename):
+                     num_items += 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/epydoc.git