Author: sebb Date: Tue Mar 10 13:22:08 2026 New Revision: 1932256 Log: Merge some updates from trunk
Modified: comdev/reporter.apache.org/branches/tooling-project/README.txt comdev/reporter.apache.org/branches/tooling-project/scripts/parsepmcs.py comdev/reporter.apache.org/branches/tooling-project/scripts/reportingcycles.py Modified: comdev/reporter.apache.org/branches/tooling-project/README.txt ============================================================================== --- comdev/reporter.apache.org/branches/tooling-project/README.txt Tue Mar 10 10:47:56 2026 (r1932255) +++ comdev/reporter.apache.org/branches/tooling-project/README.txt Tue Mar 10 13:22:08 2026 (r1932256) @@ -28,8 +28,6 @@ crontab -l -u root (in puppet, part of h 45 0,6,12,18 * * * cd /var/www/reporter.apache.org/data/releases && sudo -n -u www-data svn ci -m "updating report releases data" --username projects_role --password `cat /root/.rolepwd` --non-interactive >>/var/log/www-data-root/svnreleases_$(date "+\%Y-\%m").log # Puppet Name: rao_history_ci 10 4,12,20 * * * cd /var/www/reporter.apache.org/data/history && sudo -n -u www-data svn ci -m "updating report releases data" --username projects_role --password `cat /root/.rolepwd` --non-interactive >>/var/log/www-data-root/svnhistory_$(date "+\%Y-\%m").log -# Puppet Name: pao_json_ci -20 4 * * * cd /var/www/projects.apache.org/site/json && sudo -n -u www-data svn ci -m "updating projects data" --username projects_role --password `cat /root/.rolepwd` --non-interactive >>/var/log/www-data-root/svnjson_$(date "+\%Y-\%m").log crontab -l -u www-data: # m h dom mon dow command @@ -52,6 +50,14 @@ The Reporter API uses gunicorn and is no There are additional jobs for projects.a.o which are documented in its file STRUCTURE.txt +The application has 3 parts: +- scripts - for crontab or local use +- site - website +- data - long-term data held in SVN as well as URL cache and other ephemeral files + +All variable data should now be under the data/ tree. +This means that only the data/ tree needs to be writable by the webserver. + Scripts: - scripts/health.py Creates data/health.json @@ -70,7 +76,7 @@ Scripts: Creates data/pmcdates.json from committee_info.json -scripts/reportingcycles.py - Creates site/reportingcycles.json from committee_info.json + Creates data/reportingcycles.json from committee_info.json - scripts/mailglomper2.py Updates data/maildata_extended.json and data/maildata_partial.json from https://lists.apache.org/ @@ -88,3 +94,17 @@ Scripts: Data file consumers: - chi.py data/health.json + +- scripts/pdata.py + data/JIRA/jira_projects.json + data/JIRA/%s.json + data/health.json + data/releases/%s.json + data/pmcs.json + data/projects.json + data/maildata_extended.json + https://whimsy.apache.org/public/public_ldap_people.json + https://whimsy.apache.org/public/member-info.json + https://whimsy.apache.org/public/public_ldap_projects.json + https://projects.apache.org/json/foundation/committees.json + Modified: comdev/reporter.apache.org/branches/tooling-project/scripts/parsepmcs.py ============================================================================== --- comdev/reporter.apache.org/branches/tooling-project/scripts/parsepmcs.py Tue Mar 10 10:47:56 2026 (r1932255) +++ comdev/reporter.apache.org/branches/tooling-project/scripts/parsepmcs.py Tue Mar 10 13:22:08 2026 (r1932256) @@ -22,11 +22,6 @@ if sys.hexversion < 0x030000F0: time.time() when entry was added to an existing group time.time() when entry was last seen, ] - N.B. The timestamps are now saved as an int (the fractional part is not useful) - However existing entry times have not (yet) been trimmed. - This would cause a large change to the historical files, - so to avoid mixing this with a genuine change, it needs to be planned, and - done between normal updates. """ import errtee # this is used, even though it is not referenced Modified: comdev/reporter.apache.org/branches/tooling-project/scripts/reportingcycles.py ============================================================================== --- comdev/reporter.apache.org/branches/tooling-project/scripts/reportingcycles.py Tue Mar 10 10:47:56 2026 (r1932255) +++ comdev/reporter.apache.org/branches/tooling-project/scripts/reportingcycles.py Tue Mar 10 13:22:08 2026 (r1932256) @@ -6,14 +6,14 @@ import json Reads committee-info.json via committee_info module Creates: -../site/reportingcycles.json +../data/reportingcycles.json """ cycles = committee_info.cycles() -print("Writing ../site/reportingcycles.json") -with open("../site/reportingcycles.json", "w", encoding='utf-8') as f: +print("Writing ../data/reportingcycles.json") +with open("../data/reportingcycles.json", "w", encoding='utf-8') as f: json.dump(cycles, f, sort_keys = True, indent=1, ensure_ascii=False) print("All done!") \ No newline at end of file
