Author: hboutemy
Date: Sat May 9 17:30:23 2015
New Revision: 1678507
URL: http://svn.apache.org/r1678507
Log:
renamed accounts.json to accounts-evolution.json to better match the meaning
Added:
comdev/projects.apache.org/site/json/foundation/accounts-evolution.json
- copied unchanged from r1678504,
comdev/projects.apache.org/site/json/foundation/accounts.json
Removed:
comdev/projects.apache.org/site/json/foundation/accounts.json
Modified:
comdev/projects.apache.org/scripts/README.txt
comdev/projects.apache.org/scripts/cronjobs/countaccounts.py
comdev/projects.apache.org/site/js/projects.js
comdev/projects.apache.org/site/json/foundation/.htaccess
comdev/projects.apache.org/site/json/foundation/HEADER.html
Modified: comdev/projects.apache.org/scripts/README.txt
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/README.txt?rev=1678507&r1=1678506&r2=1678507&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/README.txt (original)
+++ comdev/projects.apache.org/scripts/README.txt Sat May 9 17:30:23 2015
@@ -4,8 +4,8 @@ various sources:
1. updating data (cronjobs)
- countaccounts.py: Extract from LDAP monthly statistics on Unix accounts
created
- in: foundation/accounts.json + ldapsearch
- out: foundation/accounts.json
+ in: foundation/accounts-evolution.json + ldapsearch
+ out: foundation/accounts-evolution.json
- parsechairs.py: Fetches current VPs from the foundation website.
in: http://www.apache.org/foundation/
Modified: comdev/projects.apache.org/scripts/cronjobs/countaccounts.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/cronjobs/countaccounts.py?rev=1678507&r1=1678506&r2=1678507&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/cronjobs/countaccounts.py (original)
+++ comdev/projects.apache.org/scripts/cronjobs/countaccounts.py Sat May 9
17:30:23 2015
@@ -1,14 +1,12 @@
#!/usr/bin/env python
-import os
import json;
import re
-import sys
from datetime import datetime
import subprocess
js = {}
-with open("../../site/json/foundation/accounts.json") as f:
+with open("../../site/json/foundation/accounts-evolution.json") as f:
js = json.loads(f.read())
f.close()
@@ -32,7 +30,7 @@ while True:
js[ym] += 1
-with open("../../site/json/foundation/accounts.json", "w") as f:
+with open("../../site/json/foundation/accounts-evolution.json", "w") as f:
f.write(json.dumps(js, sort_keys=True, indent=0))
f.close()
Modified: comdev/projects.apache.org/site/js/projects.js
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/site/js/projects.js?rev=1678507&r1=1678506&r2=1678507&view=diff
==============================================================================
--- comdev/projects.apache.org/site/js/projects.js (original)
+++ comdev/projects.apache.org/site/js/projects.js Sat May 9 17:30:23 2015
@@ -1323,7 +1323,7 @@ function preloadEverything(callback) {
["/json/foundation/cycles.json", function(json) { cycles = json; }],
["/json/foundation/chairs.json", function(json) { chairs = json; }],
["/json/foundation/podlings-evolution.json", function(json) {
evolution = json; }],
- ["/json/foundation/accounts.json", function(json) { accounts =
json; }],
+ ["/json/foundation/accounts-evolution.json", function(json) {
accounts = json; }],
["/json/foundation/committees.json", setCommittees],
["/json/foundation/projects.json", weaveInProjects],
["/json/foundation/podlings.json", weaveInProjects],
Modified: comdev/projects.apache.org/site/json/foundation/.htaccess
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/site/json/foundation/.htaccess?rev=1678507&r1=1678506&r2=1678507&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/.htaccess (original)
+++ comdev/projects.apache.org/site/json/foundation/.htaccess Sat May 9
17:30:23 2015
@@ -1,5 +1,5 @@
IndexOptions FancyIndexing DescriptionWidth=*
-AddDescription "generated by <code>cronjobs/countaccounts.py</code>"
accounts.json
+AddDescription "generated by <code>cronjobs/countaccounts.py</code>"
accounts-evolution.json
AddDescription "generated by <code>cronjobs/parsechairs.py</code>" chairs.json
AddDescription "imported with <code>import/parsecommittees.py</code>"
committees.json
AddDescription "manually maintained" cycles.json
Modified: comdev/projects.apache.org/site/json/foundation/HEADER.html
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/site/json/foundation/HEADER.html?rev=1678507&r1=1678506&r2=1678507&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/HEADER.html (original)
+++ comdev/projects.apache.org/site/json/foundation/HEADER.html Sat May 9
17:30:23 2015
@@ -3,7 +3,7 @@ Data generated from misc foundations inf
see <code><a
href="http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/";>scripts</a>/README.txt</code>
for more information.
<ul>
-<li><a href="accounts.json"><code>accounts.json</code></a> generated by
<code>cronjobs/countaccounts.py</code> from LDAP</li>
+<li><a href="accounts-evolution.json"><code>accounts-evolution.json</code></a>
generated by <code>cronjobs/countaccounts.py</code> from LDAP</li>
<li><a href="chairs.json"><code>chairs.json</code></a> generated by
<code>cronjobs/parsechairs.py</code> from <a
href="http://www.apache.org/foundation/";>http://www.apache.org/foundation/</a></li>
<li><a href="committees.json"><code>committees.json</code></a> imported with
<code>import/parsecommittees.py</code> from
<code>https://svn.apache.org/repos/private/committers/board/committee-info.txt</code></li>
<li><a href="cycles.json"><code>cycles.json</code></a> manually maintained</li>
