Author: sebb
Date: Wed Mar 5 22:09:55 2025
New Revision: 1924190
URL: http://svn.apache.org/viewvc?rev=1924190&view=rev
Log:
COMDEV-425 - allow for project[-subproject] syntax
Modified:
comdev/reporter.apache.org/trunk/scripts/rapp/kibble.py
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/kibble.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/rapp/kibble.py?rev=1924190&r1=1924189&r2=1924190&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/scripts/rapp/kibble.py (original)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/kibble.py Wed Mar 5 22:09:55
2025
@@ -32,6 +32,8 @@ def stats(project, jira = None, mlid = N
except:
pass
if runit:
+ # Allow for project[-subproject]
+ project_subfilter = "/(?:incubator-)?" + project + "(?:-.*)?\\.git"
# Issues/PRs
issues =
requests.post('https://demo.kibble.apache.org/api/issue/issues',
headers = {
@@ -42,7 +44,7 @@ def stats(project, jira = None, mlid = N
"page":"issues",
"quick":True,
"interval": "week",
- "subfilter":"/(?:incubator-)?" + project + ".*\\.git",
+ "subfilter": project_subfilter,
"distinguish":True
}
).json()
@@ -88,7 +90,7 @@ def stats(project, jira = None, mlid = N
"interval": "month",
"from": BEFORE,
"to": int(time.time()),
- "subfilter":"/(?:incubator-)?" + project + ".*\\.git",
+ "subfilter": project_subfilter,
}
).json()
@@ -153,7 +155,7 @@ def stats(project, jira = None, mlid = N
"page":"issues",
"quick":True,
"interval": "week",
- "subfilter":"/(?:incubator-)?" + project + ".*\\.git",
+ "subfilter": project_subfilter,
}
).json()
after = [x for x in commits['timeseries'] if x['date'] > BEFORE]
@@ -179,7 +181,7 @@ def stats(project, jira = None, mlid = N
"from": int(BEFORE - (90*86400)),
"to": BEFORE,
"interval": "99999d",
- "subfilter":"/(?:incubator-)?" + project + ".*\\.git",
+ "subfilter": project_subfilter,
}
).json()
authors_a =
requests.post('https://demo.kibble.apache.org/api/code/committers',
@@ -193,7 +195,7 @@ def stats(project, jira = None, mlid = N
"from": BEFORE,
"to": int(time.time()),
"interval": "99999d",
- "subfilter":"/(?:incubator-)?" + project + ".*\\.git",
+ "subfilter": project_subfilter,
}
).json()
after = authors_a['timeseries']
