Author: sebb
Date: Wed Nov 12 17:25:23 2025
New Revision: 1929687
Log:
Kibble has been retired
Deleted:
comdev/reporter.apache.org/trunk/scripts/rapp/kibble.py
Modified:
comdev/reporter.apache.org/trunk/scripts/pdata.py
comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py
==============================================================================
--- comdev/reporter.apache.org/trunk/scripts/pdata.py Wed Nov 12 12:43:12
2025 (r1929686)
+++ comdev/reporter.apache.org/trunk/scripts/pdata.py Wed Nov 12 17:25:23
2025 (r1929687)
@@ -21,7 +21,6 @@
import os, sys, re, json, time
import base64, requests
-import rapp.kibble
CACHE_TIMEOUT = 7200
@@ -250,7 +249,7 @@ pmcdates = None
TESTIDS = ['testrubys', 'testsebb', 'testdooh', 'cml-test']
# TODO: also exclude from PMC head counts?
-def generate(user, project, runkibble):
+def generate(user, project):
global lastRead
if re.match(r"^[-a-zA-Z0-9_.]+$", user):
# isMember = isASFMember(user)
@@ -350,14 +349,6 @@ def generate(user, project, runkibble):
dates = {}
checker = {} # data no longer available
- # Add in kibble data if called with only= OR only one project...
- kibble = None
- if runkibble:
- try:
- kibble = rapp.kibble.stats(project, jira = jdata[2], mlid =
mlid)
- except:
- pass
-
output = {
'count': count,
'delivery': emails,
@@ -372,7 +363,6 @@ def generate(user, project, runkibble):
'health': health,
'checker': checker,
'you': committers[user],
- 'kibble': kibble,
}
return output
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/overview.py
==============================================================================
--- comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Wed Nov 12
12:43:12 2025 (r1929686)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/overview.py Wed Nov 12
17:25:23 2025 (r1929687)
@@ -29,27 +29,19 @@ def run(environ, user):
# Try cache first? (max 6 hours old)
wanted_file = "/tmp/pdata-%s.json" % xproject
- if xproject == project:
- wanted_file = "/tmp/pdata-kibbled-%s.json" % xproject
if (os.path.exists(wanted_file) and os.path.getmtime(wanted_file) >
(time.time() - CACHE_TIMEOUT)):
mpdata = json.load(open(wanted_file, "r"))
# If cache failed, generate fom scratch
else:
- mpdata = pdata.generate(user, xproject, xproject == project)
+ mpdata = pdata.generate(user, xproject)
if not mpdata:
break
open(wanted_file, "w").write(json.dumps(mpdata))
- # Weave results into combined object, mindful of kibble data
+ # Weave results into combined object
for k, v in mpdata.items():
if k not in dumps:
- if k == 'kibble':
- dumps[k] = None # Javascript does not expect an empty
kibble dict
- else:
- dumps[k] = {}
- if (k == 'kibble'):
- if v:
- dumps[k] = v
- elif k == 'email_date':
+ dumps[k] = {}
+ if k == 'email_date':
dumps[k] = datetime.fromtimestamp(v).strftime("%Y-%m-%d")
else:
dumps[k][xproject] = v
