[Reproducible-builds] [dh-python] 04/183: remove setuptools from requires.txt

Jérémy Bobbio lunar at moszumanska.debian.org
Fri Sep 19 15:30:12 UTC 2014


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

lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.

commit 714508e797e16230a3a694cc11aba262c4ec9cff
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Jun 29 00:16:11 2013 +0200

    remove setuptools from requires.txt
---
 dhpython/pydist.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/dhpython/pydist.py b/dhpython/pydist.py
index ab0a149..dcf122e 100644
--- a/dhpython/pydist.py
+++ b/dhpython/pydist.py
@@ -192,16 +192,31 @@ def parse_pydep(impl, fname):
         ver = None
 
     result = []
+    modified = optional_section = False
+    processed = []
     with open(fname, 'r', encoding='utf-8') as fp:
         for line in fp:
             line = line.strip()
-            # ignore all optional sections
+            if not line or line.startswith('#'):
+                processed.append(line)
+                continue
             if line.startswith('['):
-                break
-            if line:
-                dependency = guess_dependency(impl, line, ver)
-                if dependency:
-                    result.append(dependency)
+                optional_section = True
+            if optional_section:
+                processed.append(line)
+                continue
+            dependency = guess_dependency(impl, line, ver)
+            if dependency:
+                result.append(dependency)
+                if 'setuptools' in line.lower():
+                    modified = True
+                else:
+                    processed.append(line)
+            else:
+                processed.append(line)
+    if modified:
+        with open(fname, 'w') as fp:
+            fp.writelines(i + '\n' for i in processed)
     return result
 
 

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



More information about the Reproducible-builds mailing list