diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-09-23 17:38:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-09-23 17:38:21 +0000 |
| commit | 637cd313cfff44c1d805fe75b8674cae6c01de82 (patch) | |
| tree | cad7cda38a45aaf5fa25844c43ddd85e5a29fb1a | |
| parent | b020a057724cdf3cff59e168058ec9eb11a347ba (diff) | |
| parent | affabf5be4db8b15974bb9ce4c16b0a8242e1fc2 (diff) | |
Merge "Don't use GitPython for authors check"
| -rw-r--r-- | nova/tests/test_misc.py | 15 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py index c5875a843..45c496568 100644 --- a/nova/tests/test_misc.py +++ b/nova/tests/test_misc.py @@ -14,6 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. +import commands import errno import os import select @@ -67,19 +68,13 @@ class ProjectTestCase(test.TestCase): tree.unlock() elif os.path.exists(os.path.join(topdir, '.git')): - import git - repo = git.Repo(topdir) - for commit in repo.head.commit.iter_parents(): - email = commit.author.email - if email is None: - email = commit.author.name - if 'nova-core' in email: + for email in commands.getoutput('git log --format=%ae').split(): + if not email: + continue + if "jenkins@review.openstack.org" in email: continue - if email.split(' ')[-1] == '<>': - email = email.split(' ')[-2] email = '<' + email + '>' contributors.add(str_dict_replace(email, mailmap)) - else: return diff --git a/tools/pip-requires b/tools/pip-requires index f47d6130c..b5d1fa713 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -21,7 +21,6 @@ wsgiref==0.1.2 mox==0.5.3 greenlet==0.3.1 nose -bzr PasteDeploy paste sqlalchemy-migrate @@ -33,6 +32,5 @@ nova-adminclient suds==0.4 coverage nosexcover -GitPython paramiko feedparser |