openstack/goal-tools
Code Issues Proposed changes

add an option to include +1 votes in stats

Browse Source 
We still ignore +1 votes by default, but for some specific queries it
can be useful to include them so provide an option to do that.

Change-Id: If884da27382f7bb59e6e889b52ad1fc34aca5c0f
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2018-05-07 12:47:17 -04:00
parent 4603f44d86
commit 39205f5f03
4 changed files with 576 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
goal_tools/gerrit.py
View File

@ -197,6 +197,22 @@ class Review:
_to_datetime(label.get('date')),
)
@property
def plus_ones(self):
labels = self._data.get('labels', {})
code_review_labels = labels.get('Code-Review', {}).get('all', [])
for label in code_review_labels:
if label.get('value') != 1:
# Other types of reviews are counted elsewhere.
continue
yield Participant(
'plus_one',
label.get('name', 'Unknown Person'),
label.get('email', 'unknown@example.com'),
_to_datetime(label.get('date')),
)
def cache_review(review_id, data, cache):
"""Add a review to the cache.

516
goal_tools/tests/data/566433.json Normal file
View File

@ -0,0 +1,516 @@
{
"_number": 566433,
"branch": "master",
"change_id": "I841814148e1d84c7a5779a31a4b8ba38a1e8df21",
"created": "2018-05-05 12:53:23.000000000",
"current_revision": "c5c456c2c9a0c04cb7b37a9e92ffd9797ca61923",
"deletions": 0,
"hashtags": [],
"id": "openstack%2Freleases~master~I841814148e1d84c7a5779a31a4b8ba38a1e8df21",
"insertions": 5,
"labels": {
"Code-Review": {
"all": [
{
"_account_id": 11904,
"date": "2018-05-06 06:09:45.000000000",
"email": "sean.mcginnis@gmail.com",
"name": "Sean McGinnis",
"username": "SeanM",
"value": 2
},
{
"_account_id": 12404,
"email": "rico.lin@easystack.cn",
"name": "Rico Lin",
"username": "rico.lin",
"value": 0
},
{
"_account_id": 2472,
"date": "2018-05-07 15:49:04.000000000",
"email": "doug@doughellmann.com",
"name": "Doug Hellmann",
"username": "doug-hellmann",
"value": 2
},
{
"_account_id": 7385,
"email": "therve@redhat.com",
"name": "Thomas Herve",
"username": "therve",
"value": 0
},
{
"_account_id": 17130,
"date": "2018-05-06 12:07:02.000000000",
"email": "ma.lei@99cloud.net",
"name": "melissaml",
"username": "malei",
"value": 1
},
{
"_account_id": 22348,
"name": "Zuul",
"username": "zuul",
"value": 0
},
{
"_account_id": 26285,
"date": "2018-05-06 14:06:46.000000000",
"email": "wu.chunyang@99cloud.net",
"name": "wu.chunyang",
"username": "wu.chunyang",
"value": 1
},
{
"_account_id": 26222,
"date": "2018-05-06 07:56:18.000000000",
"email": "hoangphuocbk2.07@gmail.com",
"name": "Cong Phuoc Hoang",
"username": "hoangphuoc",
"value": 1
},
{
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh",
"value": 0
}
],
"approved": {
"_account_id": 11904,
"email": "sean.mcginnis@gmail.com",
"name": "Sean McGinnis",
"username": "SeanM"
},
"default_value": 0,
"values": {
" 0": "No score",
"+1": "Looks good to me, but someone else must approve",
"+2": "Looks good to me (core reviewer)",
"-1": "This patch needs further work before it can be merged",
"-2": "Do not merge"
}
},
"Verified": {
"all": [
{
"_account_id": 11904,
"email": "sean.mcginnis@gmail.com",
"name": "Sean McGinnis",
"username": "SeanM"
},
{
"_account_id": 12404,
"email": "rico.lin@easystack.cn",
"name": "Rico Lin",
"username": "rico.lin"
},
{
"_account_id": 2472,
"email": "doug@doughellmann.com",
"name": "Doug Hellmann",
"username": "doug-hellmann"
},
{
"_account_id": 7385,
"email": "therve@redhat.com",
"name": "Thomas Herve",
"username": "therve"
},
{
"_account_id": 17130,
"email": "ma.lei@99cloud.net",
"name": "melissaml",
"username": "malei"
},
{
"_account_id": 22348,
"date": "2018-05-05 16:32:38.000000000",
"name": "Zuul",
"username": "zuul",
"value": 1
},
{
"_account_id": 26285,
"email": "wu.chunyang@99cloud.net",
"name": "wu.chunyang",
"username": "wu.chunyang"
},
{
"_account_id": 26222,
"email": "hoangphuocbk2.07@gmail.com",
"name": "Cong Phuoc Hoang",
"username": "hoangphuoc"
},
{
"_account_id": 16511,
"date": "2018-05-05 19:37:06.000000000",
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
}
],
"default_value": 0,
"recommended": {
"_account_id": 22348,
"name": "Zuul",
"username": "zuul"
},
"value": 1,
"values": {
" 0": "No score",
"+1": "Works for me",
"+2": "Verified",
"-1": "Doesn't seem to work",
"-2": "Fails"
}
},
"Workflow": {
"all": [
{
"_account_id": 11904,
"email": "sean.mcginnis@gmail.com",
"name": "Sean McGinnis",
"username": "SeanM",
"value": 0
},
{
"_account_id": 12404,
"date": "2018-05-06 06:09:21.000000000",
"email": "rico.lin@easystack.cn",
"name": "Rico Lin",
"username": "rico.lin"
},
{
"_account_id": 2472,
"email": "doug@doughellmann.com",
"name": "Doug Hellmann",
"username": "doug-hellmann",
"value": 0
},
{
"_account_id": 7385,
"date": "2018-05-06 06:09:28.000000000",
"email": "therve@redhat.com",
"name": "Thomas Herve",
"username": "therve"
},
{
"_account_id": 17130,
"email": "ma.lei@99cloud.net",
"name": "melissaml",
"username": "malei"
},
{
"_account_id": 22348,
"name": "Zuul",
"username": "zuul"
},
{
"_account_id": 26285,
"email": "wu.chunyang@99cloud.net",
"name": "wu.chunyang",
"username": "wu.chunyang"
},
{
"_account_id": 26222,
"email": "hoangphuocbk2.07@gmail.com",
"name": "Cong Phuoc Hoang",
"username": "hoangphuoc"
},
{
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh",
"value": 0
}
],
"default_value": 0,
"values": {
" 0": "Ready for reviews",
"+1": "Approved",
"-1": "Work in progress"
}
}
},
"mergeable": true,
"messages": [
{
"_revision_number": 1,
"author": {
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
},
"date": "2018-05-05 12:53:23.000000000",
"id": "5f7c97a3_d645f918",
"message": "Uploaded patch set 1."
},
{
"_revision_number": 1,
"author": {
"_account_id": 22348,
"name": "Zuul",
"username": "zuul"
},
"date": "2018-05-05 12:59:34.000000000",
"id": "5f7c97a3_9647811e",
"message": "Patch Set 1: Verified+1\n\nBuild succeeded (check pipeline).\n\n- openstack-tox-validate http://logs.openstack.org/33/566433/1/check/openstack-tox-validate/22522fa/ : SUCCESS in 4m 01s\n- releases-tox-list-changes http://logs.openstack.org/33/566433/1/check/releases-tox-list-changes/31cd2b8/ : SUCCESS in 2m 33s\n- build-openstack-sphinx-docs http://logs.openstack.org/33/566433/1/check/build-openstack-sphinx-docs/4bbba74/html/ : SUCCESS in 5m 19s"
},
{
"_revision_number": 1,
"author": {
"_account_id": 2472,
"email": "doug@doughellmann.com",
"name": "Doug Hellmann",
"username": "doug-hellmann"
},
"date": "2018-05-05 13:46:13.000000000",
"id": "5f7c97a3_36f0edc9",
"message": "Patch Set 1:\n\n(1 comment)"
},
{
"_revision_number": 2,
"author": {
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
},
"date": "2018-05-05 16:20:31.000000000",
"id": "5f7c97a3_d6d5f9ba",
"message": "Uploaded patch set 2."
},
{
"_revision_number": 2,
"author": {
"_account_id": 22348,
"name": "Zuul",
"username": "zuul"
},
"date": "2018-05-05 16:32:38.000000000",
"id": "5f7c97a3_56e1e999",
"message": "Patch Set 2: Verified+1\n\nBuild succeeded (check pipeline).\n\n- openstack-tox-validate http://logs.openstack.org/33/566433/2/check/openstack-tox-validate/bcb21a1/ : SUCCESS in 4m 16s\n- releases-tox-list-changes http://logs.openstack.org/33/566433/2/check/releases-tox-list-changes/a1cd04a/ : SUCCESS in 3m 05s\n- build-openstack-sphinx-docs http://logs.openstack.org/33/566433/2/check/build-openstack-sphinx-docs/11c542f/html/ : SUCCESS in 6m 51s"
},
{
"_revision_number": 2,
"author": {
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
},
"date": "2018-05-05 19:37:06.000000000",
"id": "5f7c97a3_51b57330",
"message": "Patch Set 2:\n\nThanks Doug. The point release is all I really need."
},
{
"_revision_number": 2,
"author": {
"_account_id": 11904,
"email": "sean.mcginnis@gmail.com",
"name": "Sean McGinnis",
"username": "SeanM"
},
"date": "2018-05-06 06:09:45.000000000",
"id": "5f7c97a3_0ca03ef4",
"message": "Patch Set 2: Code-Review+2\n\nLooks good. We just need an ack from the PTL or release liaison."
},
{
"_revision_number": 2,
"author": {
"_account_id": 26222,
"email": "hoangphuocbk2.07@gmail.com",
"name": "Cong Phuoc Hoang",
"username": "hoangphuoc"
},
"date": "2018-05-06 07:56:18.000000000",
"id": "5f7c97a3_0cbd9eb6",
"message": "Patch Set 2: Code-Review+1"
},
{
"_revision_number": 2,
"author": {
"_account_id": 17130,
"email": "ma.lei@99cloud.net",
"name": "melissaml",
"username": "malei"
},
"date": "2018-05-06 12:07:02.000000000",
"id": "5f7c97a3_a798456a",
"message": "Patch Set 2: Code-Review+1"
},
{
"_revision_number": 2,
"author": {
"_account_id": 26285,
"email": "wu.chunyang@99cloud.net",
"name": "wu.chunyang",
"username": "wu.chunyang"
},
"date": "2018-05-06 14:06:46.000000000",
"id": "5f7c97a3_47e1319a",
"message": "Patch Set 2: Code-Review+1"
},
{
"_revision_number": 2,
"author": {
"_account_id": 2472,
"email": "doug@doughellmann.com",
"name": "Doug Hellmann",
"username": "doug-hellmann"
},
"date": "2018-05-07 15:49:04.000000000",
"id": "5f7c97a3_1a286284",
"message": "Patch Set 2: Code-Review+2\n\nCongratulations on hitting 1.0! I've added Rico and Thomas to get one of them to +1 and then we can proceed."
}
],
"owner": {
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
},
"permitted_labels": {},
"project": "openstack/releases",
"removable_reviewers": [],
"reviewer_updates": [],
"reviewers": {
"CC": [
{
"_account_id": 7385,
"email": "therve@redhat.com",
"name": "Thomas Herve",
"username": "therve"
},
{
"_account_id": 12404,
"email": "rico.lin@easystack.cn",
"name": "Rico Lin",
"username": "rico.lin"
},
{
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
}
],
"REVIEWER": [
{
"_account_id": 2472,
"email": "doug@doughellmann.com",
"name": "Doug Hellmann",
"username": "doug-hellmann"
},
{
"_account_id": 11904,
"email": "sean.mcginnis@gmail.com",
"name": "Sean McGinnis",
"username": "SeanM"
},
{
"_account_id": 17130,
"email": "ma.lei@99cloud.net",
"name": "melissaml",
"username": "malei"
},
{
"_account_id": 22348,
"name": "Zuul",
"username": "zuul"
},
{
"_account_id": 26222,
"email": "hoangphuocbk2.07@gmail.com",
"name": "Cong Phuoc Hoang",
"username": "hoangphuoc"
},
{
"_account_id": 26285,
"email": "wu.chunyang@99cloud.net",
"name": "wu.chunyang",
"username": "wu.chunyang"
}
]
},
"revisions": {
"bbf0a8cfce9f9e86950fd5a4f0b82b75e16ae55b": {
"_number": 1,
"created": "2018-05-05 12:53:23.000000000",
"fetch": {
"anonymous http": {
"ref": "refs/changes/33/566433/1",
"url": "https://git.openstack.org/openstack/releases"
},
"git": {
"ref": "refs/changes/33/566433/1",
"url": "git://git.openstack.org/openstack/releases"
}
},
"kind": "REWORK",
"ref": "refs/changes/33/566433/1",
"uploader": {
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
}
},
"c5c456c2c9a0c04cb7b37a9e92ffd9797ca61923": {
"_number": 2,
"commit": {
"author": {
"date": "2018-05-05 12:52:34.000000000",
"email": "bob.haddleton@nokia.com",
"name": "Bob.Haddleton",
"tz": -300
},
"committer": {
"date": "2018-05-05 16:20:08.000000000",
"email": "bob.haddleton@nokia.com",
"name": "Bob.Haddleton",
"tz": -300
},
"message": "tosca-parser-1.0.0\n\ntosca-parser-1.0.0 is required for heat-translator to use new\nversions of several objects.\n\nChange-Id: I841814148e1d84c7a5779a31a4b8ba38a1e8df21\n",
"parents": [
{
"commit": "e87cac985b1662cebee5b3bb2553a168d9257874",
"subject": "Release 0.13.1 of os-client-config"
}
],
"subject": "tosca-parser-1.0.0"
},
"created": "2018-05-05 16:20:31.000000000",
"fetch": {
"anonymous http": {
"ref": "refs/changes/33/566433/2",
"url": "https://git.openstack.org/openstack/releases"
},
"git": {
"ref": "refs/changes/33/566433/2",
"url": "git://git.openstack.org/openstack/releases"
}
},
"kind": "REWORK",
"ref": "refs/changes/33/566433/2",
"uploader": {
"_account_id": 16511,
"email": "bob.haddleton@nokia.com",
"name": "Bob Haddleton",
"username": "bobh"
}
}
},
"status": "NEW",
"subject": "tosca-parser-1.0.0",
"submit_type": "MERGE_IF_NECESSARY",
"submittable": false,
"topic": "tosca-parser-1.0.0",
"updated": "2018-05-07 15:49:04.000000000"
}

28
goal_tools/tests/test_gerrit.py
View File

@ -27,6 +27,9 @@ _data_55535 = json.loads(
_data_561507 = json.loads(
pkgutil.get_data('goal_tools.tests', 'data/561507.json').decode('utf-8')
)
_data_566433 = json.loads(
pkgutil.get_data('goal_tools.tests', 'data/566433.json').decode('utf-8')
)
class TestParseReviewLists(base.TestCase):
@ -83,6 +86,7 @@ class TestReview(base.TestCase):
super().setUp()
self.rev = gerrit.Review('55535', _data_55535)
self.rev2 = gerrit.Review('561507', _data_561507)
self.rev3 = gerrit.Review('566433', _data_566433)
def test_url(self):
self.assertEqual('https://review.openstack.org/55535/', self.rev.url)
@ -136,6 +140,30 @@ class TestReview(base.TestCase):
]
self.assertEqual(expected, reviewers)
def test_plus_ones(self):
reviewers = list(self.rev3.plus_ones)
expected = [
gerrit.Participant(
role='plus_one',
name='melissaml',
email='ma.lei@99cloud.net',
date=datetime.datetime(2018, 5, 6, 12, 7, 2),
),
gerrit.Participant(
role='plus_one',
name='wu.chunyang',
email='wu.chunyang@99cloud.net',
date=datetime.datetime(2018, 5, 6, 14, 6, 46),
),
gerrit.Participant(
role='plus_one',
name='Cong Phuoc Hoang',
email='hoangphuocbk2.07@gmail.com',
date=datetime.datetime(2018, 5, 6, 7, 56, 18),
),
]
self.assertEqual(expected, reviewers)
def test_uploaders(self):
uploaders = list(self.rev.uploaders)
expected = [

17
goal_tools/who_helped/contributions.py
View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import itertools
import logging
from cliff import columns
@ -54,6 +55,12 @@ class ListContributions(lister.Lister):
default=governance.PROJECTS_LIST,
help='location of governance project list',
)
parser.add_argument(
'--include-plus-one',
default=False,
action='store_true',
help='include +1 votes',
)
parser.add_argument(
'review_list',
nargs='+',
@ -81,7 +88,15 @@ class ListContributions(lister.Lister):
team_name = team_data.get_repo_owner(review.project)
for participant in review.participants:
if parsed_args.include_plus_one:
participants = itertools.chain(
review.participants,
review.plus_ones,
)
else:
participants = review.participants
for participant in participants:
# Figure out which organization the user was
# affiliated with at the time of the work.