openstack/project-config
Code Issues Proposed changes

Merge "Only error for duplicate requirements when strict"

Browse Source
This commit is contained in:
Jenkins 2016-08-09 08:05:24 +00:00 committed by Gerrit Code Review
commit 9337c700ad
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jenkins/scripts/project-requirements-change.py
View File

@ -53,7 +53,7 @@ class RequirementsList(object):
return {k: v for d in self.reqs_by_file.values() return {k: v for d in self.reqs_by_file.values()
for k, v in d.items()} for k, v in d.items()}
def extract_reqs(self, content): def extract_reqs(self, content, strict):
reqs = collections.defaultdict(set) reqs = collections.defaultdict(set)
parsed = requirement.parse(content) parsed = requirement.parse(content)
for name, entries in parsed.items(): for name, entries in parsed.items():
@ -63,7 +63,8 @@ class RequirementsList(object):
list_reqs = [r for (r, line) in entries] list_reqs = [r for (r, line) in entries]
# Strip the comments out before checking if there are duplicates # Strip the comments out before checking if there are duplicates
list_reqs_stripped = [r._replace(comment='') for r in list_reqs] list_reqs_stripped = [r._replace(comment='') for r in list_reqs]
if len(list_reqs_stripped) != len(set(list_reqs_stripped)): if strict and len(list_reqs_stripped) != len(set(
list_reqs_stripped)):
print("Requirements file has duplicate entries " print("Requirements file has duplicate entries "
"for package %s : %r." % (name, list_reqs)) "for package %s : %r." % (name, list_reqs))
self.failed = True self.failed = True
@ -85,11 +86,11 @@ class RequirementsList(object):
if strict and not content.endswith('\n'): if strict and not content.endswith('\n'):
print("Requirements file %s does not " print("Requirements file %s does not "
"end with a newline." % fname) "end with a newline." % fname)
self.reqs_by_file[fname] = self.extract_reqs(content) self.reqs_by_file[fname] = self.extract_reqs(content, strict)
for name, content in project.extras(self.project).items(): for name, content in project.extras(self.project).items():
print("Processing .[%(extra)s]" % {'extra': name}) print("Processing .[%(extra)s]" % {'extra': name})
self.reqs_by_file[name] = self.extract_reqs(content) self.reqs_by_file[name] = self.extract_reqs(content, strict)
def grab_args(): def grab_args():