esc-reporting/esc-analyze.py | 5 --- esc-reporting/esc-collect.py | 44 ---------------------------------- esc-reporting/esc-report.py | 55 ------------------------------------------- 3 files changed, 104 deletions(-)
New commits: commit 0a2da8bb7e9b6dadd4acf66ca8fdb2c5181d0d6b Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Wed Mar 8 14:12:00 2023 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Wed Mar 8 14:12:00 2023 +0100 esc: Remove MAB section Change-Id: I84962b0eaedbe710eb73e2c461a7e8c87383f3e7 diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py index 4b08459d..30b3283b 100755 --- a/esc-reporting/esc-analyze.py +++ b/esc-reporting/esc-analyze.py @@ -553,7 +553,6 @@ def analyze_esc(): statList['data']['esc']['QAstat'] = {'opened': bugzillaESCData['ESC_QA_STATS_UPDATE']['opened'], 'closed': bugzillaESCData['ESC_QA_STATS_UPDATE']['closed']} - statList['data']['esc']['MAB'] = {} statList['escList']['QAstat'] = {'top15_squashers' : {}, 'top15_reporters' : {}, 'top15_fixers' : [], @@ -611,10 +610,6 @@ def analyze_esc(): statList['escList']['QAstat']['top15_fixers'] = bug_fixers statList['escList']['QAstat']['top15_confirmers'] = bug_confirmers - for id, row in bugzillaESCData['ESC_MAB_UPDATE'].items(): - statList['data']['esc']['MAB'][id] = row - statList['data']['esc']['MAB'][id]['%'] = int((row['open'] / row['total'])*100) - statList['escList']['bisect'] = weekList['escList']['bisect'] statList['escList']['bisect'].insert(0, [bugzillaESCData['ESC_BISECTED_UPDATE']['open'], bugzillaESCData['ESC_BISECTED_UPDATE']['total']]) diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py index 5af452c0..95c9ecc4 100755 --- a/esc-reporting/esc-collect.py +++ b/esc-reporting/esc-collect.py @@ -265,48 +265,6 @@ def do_ESC_QA_STATS_UPDATE(): rawList[topNames[curTopIndex]].append(x) return rawList - - -def do_ESC_MAB_UPDATE(bz): - # load report from Bugzilla - url = bz + '&f1=version&o1=regexp&priority=highest&v1=^' - rawList = {} - - series = {'6.0' : '6.0', - '5.4' : '5.4', - '5.3' : '5.3', - '5.2' : '5.2', - '5.1' : '5.1', - '5.0' : '5.0', - '4.5' : '5.0', # urgh - '4.4' : '4.4', - '4.3' : '4.3', - '4.2' : '4.2', - '4.1' : '4.1', - '4.0' : '4.0', - '3.6' : 'old', - '3.5' : 'old', - '3.4' : 'old', - '3.3' : 'old', - 'Inherited from OOo' : 'old', - 'PreBibisect' : 'old', - 'unspecified' : 'old' - } - - for key, id in series.items(): - if id not in rawList: - rawList[id] = {'open': 0, 'total': 0} - - urlCall = url + key + '.*' - tmpTotal = util_load_url(urlCall, useRaw=True) - rawList[id]['total'] += len(tmpTotal.split('\n')) -1 - tmpOpen = util_load_url(urlCall + "&resolution=---", useRaw=True) - rawList[id]['open'] += len(tmpOpen.split('\n')) - 1 - - return rawList - - - def do_ESC_counting(bz, urlAdd): rawList = [] tmp = util_load_url(bz + urlAdd, useRaw=True).split('\n')[1:] @@ -323,7 +281,6 @@ def get_esc_bugzilla(cfg): print("Updating ESC bugzilla dump") rawList = {'ESC_QA_STATS_UPDATE': {}, - 'ESC_MAB_UPDATE': {}, 'ESC_BISECTED_UPDATE': {}, 'ESC_BIBISECTED_UPDATE': {}, 'ESC_COMPONENT_UPDATE': {'all': {}, 'high': {}, 'os': {}}, @@ -338,7 +295,6 @@ def get_esc_bugzilla(cfg): '&human=1' rawList['ESC_QA_STATS_UPDATE'] = do_ESC_QA_STATS_UPDATE() - rawList['ESC_MAB_UPDATE'] = do_ESC_MAB_UPDATE(bz) urlBi = '&keywords=bisected%2C' url = '&order=tag DESC%2Cchangeddate DESC%2Cversion DESC%2Cpriority%2Cbug_severity' diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py index df9b80a7..4eac0169 100755 --- a/esc-reporting/esc-report.py +++ b/esc-reporting/esc-report.py @@ -269,19 +269,6 @@ def report_esc_prototype(): txt += ' {:<23} {}\n'.format(name, count) escPrototype = escPrototype.replace('$<ESC_QA_STATS_UPDATE>', txt) - txt = '' - oldRow = statList['data']['esc']['MAB']['old'] - del statList['data']['esc']['MAB']['old'] - keyList = sorted(statList['data']['esc']['MAB'], reverse=True) - keyList.append('old') - statList['data']['esc']['MAB']['old'] = oldRow - for id in keyList: - row = statList['data']['esc']['MAB'][id] - diff = statList['diff']['esc']['MAB'][id] - mab = '{} : {}/{} -'.format(id, row['open'], row['total']) - txt += ' {:<16} {} % ({:+d})\n'.format(mab, row['%'], diff['%']) - escPrototype = escPrototype.replace('$<ESC_MAB_UPDATE>', txt) - txt = ' + ' for row in statList['escList']['bisect']: txt += str(row[0]) + '/' + str(row[1]) + ' ' @@ -364,46 +351,6 @@ def report_esc_prototype(): return {'title': data, 'mail': 'mentor...@documentfoundation.org', 'file': '/tmp/esc_prototype_report.txt'} - -def gen_rowHighPriority(): - global statList - - txt1 = '' - txt2 = '' - vSumOpen = 0 - vSumTotal = 0 - for i in ['old', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5']: - if i in statList['data']['esc']['MAB']: - vOpen = statList['data']['esc']['MAB'][i]['open'] - vTotal = statList['data']['esc']['MAB'][i]['total'] - else : - vOpen = 0 - vTotal = 0 - vClosed = vTotal - vOpen - vSumOpen += vOpen - vSumTotal += vTotal - - txt1 += '<table:table-cell office:value-type="float" office:value="{xOpen}" calcext:value-type="float">' \ - '<text:p>{xOpen}</text:p></table:table-cell>' \ - '<table:table-cell office:value-type="float" office:value="{xClosed}" calcext:value-type="float">' \ - '<text:p>{xClosed}</text:p></table:table-cell>\n'.format(xOpen=vOpen, xClosed=vClosed) - txt2 += '<table:table-cell office:value-type="float" office:value="{xTotal}" calcext:value-type="float">' \ - '<text:p>{xTotal}</text:p></table:table-cell>\n'.format(xTotal=vTotal) - - vSumTotal -= vSumOpen - text = '<table:table-row table:style-name="ro2">' \ - '<table:table-cell table:style-name="isodate" office:value-type="date" ' \ - 'office:date-value="{xDate}" calcext:value-type="date">' \ - '<text:p>{xDate}</text:p></table:table-cell>\n'.format(xDate=statList['addDate']) + txt1 + txt2 - text += '<table:table-cell office:value-type="float" office:value="{xSumOpen}" calcext:value-type="float">' \ - '<text:p>{xSumOpen}</text:p></table:table-cell>\n' \ - '<table:table-cell office:value-type="float" office:value="{xSumClosed}" calcext:value-type="float">' \ - '<text:p>{xSumClosed}</text:p></table:table-cell>\n' \ - '</table:table-row>\n'.format(xSumOpen=vSumOpen, xSumClosed=vSumTotal) - return text - - - def gen_rowRegression(useHigh=False): global statList @@ -492,8 +439,6 @@ def report_bug_metrics(): elif text[startIndex:].startswith('"Legacy"'): # no handling continue - elif text[startIndex:].startswith('"HighPriority"'): - text = text[:endIndex] + gen_rowHighPriority() + text[endIndex:] elif text[startIndex:].startswith('"Regressions"'): text = text[:endIndex] + gen_rowRegression() + text[endIndex:] elif text[startIndex:].startswith('"HighPrioRegressions"'):