x/anvil
Code Issues Proposed changes

Merge pull request #378 from harlowja/master

Browse Source 
Changelog and testing fixups.
This commit is contained in:
Joshua Harlow 2013-01-24 11:13:21 -08:00
commit 1ac4f8f1da
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anvil/components/__init__.py
View File

@ -934,7 +934,7 @@ class PythonTestingComponent(component.Component):
pep8_wanted = None pep8_wanted = None
if isinstance(i_sibling, (PythonInstallComponent)): if isinstance(i_sibling, (PythonInstallComponent)):
for p in i_sibling.pip_requires: for p in i_sibling.pip_requires:
req = p['__requirement'] req = p['requirement']
if req.key == "pep8": if req.key == "pep8":
pep8_wanted = req pep8_wanted = req
break break

20
anvil/packaging/helpers/changelog.py
View File

@ -35,6 +35,15 @@ from anvil import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
PER_CALL_AM = 50 PER_CALL_AM = 50
SKIP_EMAILS = [
'jenkins@review.openstack.org',
]
SKIP_SUMMARIES = [
re.compile(r'^merge commit', re.I),
re.compile(r'^merge branch', re.I),
re.compile(r'^merge pull', re.I),
re.compile(r'^merge remote', re.I),
]
def translate_utf8(text): def translate_utf8(text):
@ -85,13 +94,12 @@ class GitChangeLog(object):
LOG.warn("Non-utf8 field %s found", f) LOG.warn("Non-utf8 field %s found", f)
return True return True
email = email.lower().strip() email = email.lower().strip()
if email in ['jenkins@review.openstack.org']: if email in SKIP_EMAILS:
return True
summary = summary.lower().strip()
if summary.startswith('merge commit') or \
summary.startswith("merge branch") or \
summary.startswith("merge remote"):
return True return True
summary = summary.strip()
for s in SKIP_SUMMARIES:
if s.search(summary):
return True
if not all([summary, date, email, name]): if not all([summary, date, email, name]):
return True return True
return False return False