community-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1678532 - in /comdev/projects.apache.org: scripts/ scripts/import/ site/js/ site/json/foundation/
Date Sun, 10 May 2015 00:40:02 GMT
Author: hboutemy
Date: Sun May 10 00:40:01 2015
New Revision: 1678532

URL: http://svn.apache.org/r1678532
Log:
renamed committees.json to tlps-evolution.json to better match the meaning

Added:
    comdev/projects.apache.org/site/json/foundation/tlps-evolution.json
      - copied unchanged from r1678531, comdev/projects.apache.org/site/json/foundation/committees.json
Removed:
    comdev/projects.apache.org/site/json/foundation/committees.json
Modified:
    comdev/projects.apache.org/scripts/README.txt
    comdev/projects.apache.org/scripts/import/addpmc.py
    comdev/projects.apache.org/scripts/import/parsecommittees.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=1678532&r1=1678531&r2=1678532&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/README.txt (original)
+++ comdev/projects.apache.org/scripts/README.txt Sun May 10 00:40:01 2015
@@ -30,9 +30,9 @@ various sources:
 
 2. importing data (import)
 
-- parsecommittees.py: Parses committee-info.txt to detect new TLPs and add them to committees.json
-  in: foundation/committees.json + committee-info.txt (https://svn.apache.org/repos/private/committers/board/committee-info.txt)
-  out: foundation/committees.json
+- parsecommittees.py: Parses committee-info.txt to detect new TLPs and add them to tlps-evolution.json
+  in: foundation/tlps-evolution.json + committee-info.txt (https://svn.apache.org/repos/private/committers/board/committee-info.txt)
+  out: foundation/tlps-evolution.json
 
 - parsepmcs.py: imports PMC data from the old project.apache.org site. No need
   to run that more than once?
@@ -45,9 +45,9 @@ various sources:
   out: projects/*.json + foundation/projects.json
 
 - addpmc.py
-  in: foundation/pmcs.json + foundation/committees.json + params
-  out: foundation/pmcs.json + foundation/committees.json
-  list of PMCs with site url (pmcs.json) and monthly list of new committees (committees.json)
+  in: foundation/pmcs.json + foundation/tlps-evolution.json + params
+  out: foundation/pmcs.json + foundation/tlps-evolution.json
+  list of PMCs with site url (pmcs.json) and monthly list of new committees (tlps-evolution.json)
 
 
 Notice: cycles.json is not imported from anywhere (could/should be from committee-info.txt)

Modified: comdev/projects.apache.org/scripts/import/addpmc.py
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/import/addpmc.py?rev=1678532&r1=1678531&r2=1678532&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/import/addpmc.py (original)
+++ comdev/projects.apache.org/scripts/import/addpmc.py Sun May 10 00:40:01 2015
@@ -9,14 +9,14 @@ if len(sys.argv) != 4:
     print("Usage: addpmc.py pmcuid pmcname founded-date")
     print("Example: addpmc.py drill 'Apache Drill' '2015-01'")
     sys.exit(1)
-    
+
 js = {}
 with open("../../site/json/foundation/pmcs.json") as f:
     js = json.loads(f.read())
     f.close()
-    
+
 cjs = {}
-with open("../../site/json/foundation/committees.json") as f:
+with open("../../site/json/foundation/tlps-evolution.json") as f:
     cjs = json.loads(f.read())
     f.close()
 uid = sys.argv[1]
@@ -27,25 +27,25 @@ if uid in js:
     print("Updating %s in PMC list" % uid)
 else:
     print("Adding %s to PMC list" % uid)
-    
+
 js[uid] = {
         'homepage': "http://%s.apache.org" % uid,
         'name': name
     }
 
 if founded in cjs:
-    print("Updating %s in committee info" % founded)
+    print("Updating %s in tlps-evolution" % founded)
     cjs[founded].append(name)
 else:
-    print("Adding %s to committee info under %s" % (name, founded))
+    print("Adding %s to tlps-evolution under %s" % (name, founded))
     cjs[founded] = [name]
 
 with open("../../site/json/foundation/pmcs.json", "w") as f:
     f.write(json.dumps(js, sort_keys=True, indent=0))
     f.close()
-    
-with open("../../site/json/foundation/committees.json", "w") as f:
+
+with open("../../site/json/foundation/tlps-evolution.json", "w") as f:
     f.write(json.dumps(cjs, sort_keys=True, indent=0))
     f.close()
-    
+
 print("Done!")
\ No newline at end of file

Modified: comdev/projects.apache.org/scripts/import/parsecommittees.py
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/import/parsecommittees.py?rev=1678532&r1=1678531&r2=1678532&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/import/parsecommittees.py (original)
+++ comdev/projects.apache.org/scripts/import/parsecommittees.py Sun May 10 00:40:01 2015
@@ -2,19 +2,19 @@ import re
 import json
 import sys
 
-# Committee names from committees-info.txt that do not match committees.json
+# Committee names from committees-info.txt that do not match tlps-evolution.json
 renamesCommittee2Json = {
     'Apache APR': 'Apache Portable Runtime',
     'Apache Perl': 'Apache mod_perl'
 }
-# Committee names from http://www.apache.org/foundation/ that do not match committees.json
+# Committee names from http://www.apache.org/foundation/ that do not match tlps-evolution.json
 renamesChairs2Json = {
     'Apache Logging Services': 'Apache Logging',
     'Apache Perl': 'Apache mod_perl'
 }
 
-with open("../../site/json/foundation/committees.json", "r") as f:
-    committees = json.loads(f.read())
+with open("../../site/json/foundation/tlps-evolution.json", "r") as f:
+    tlpsEvolution = json.loads(f.read())
     f.close()
 
 try:
@@ -47,19 +47,19 @@ for pmc in re.findall(r"\* .+?\s+\(est\.
             #print(project)
             tlpCount += 1
             key = "%s-%s" % (year, month)
-            if not key in committees:
-                committees[key] = []
-            if not project in committees[key]:
-                committees[key].append(project)
-                committees[key].sort()
+            if not key in tlpsEvolution:
+                tlpsEvolution[key] = []
+            if not project in tlpsEvolution[key]:
+                tlpsEvolution[key].append(project)
+                tlpsEvolution[key].sort()
                 addedTlps.append("%s: %s" % (key, project))
         else:
             # Special Committee (Officer's, President's or Board)
             print("INFO: %s ignored %s" % (project, pmc[pmc.rfind('('):]))
         c[project] = True
 
-with open("../../site/json/foundation/committees.json", "w") as f:
-    f.write(json.dumps(committees, sort_keys=True, indent=0))
+with open("../../site/json/foundation/tlps-evolution.json", "w") as f:
+    f.write(json.dumps(tlpsEvolution, sort_keys=True, indent=0))
     f.close()
 
 print("found %s new TLPs from %s TLPs in committee_info.txt" % (len(addedTlps), tlpCount))

Modified: comdev/projects.apache.org/site/js/projects.js
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/js/projects.js?rev=1678532&r1=1678531&r2=1678532&view=diff
==============================================================================
--- comdev/projects.apache.org/site/js/projects.js (original)
+++ comdev/projects.apache.org/site/js/projects.js Sun May 10 00:40:01 2015
@@ -1324,7 +1324,7 @@ function preloadEverything(callback) {
 	    ["/json/foundation/chairs.json", function(json) { chairs = json; }],
 	    ["/json/foundation/podlings-evolution.json", function(json) { evolution = json; }],
 	    ["/json/foundation/accounts-evolution.json", function(json) { accounts = json; }],
-	    ["/json/foundation/committees.json", setCommittees],
+	    ["/json/foundation/tlps-evolution.json", setCommittees],
 	    ["/json/foundation/projects.json", weaveInProjects],
 	    ["/json/foundation/podlings.json", weaveInProjects],
 	    ["/json/foundation/groups.json", weaveInGroups],

Modified: comdev/projects.apache.org/site/json/foundation/.htaccess
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/json/foundation/.htaccess?rev=1678532&r1=1678531&r2=1678532&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/.htaccess (original)
+++ comdev/projects.apache.org/site/json/foundation/.htaccess Sun May 10 00:40:01 2015
@@ -1,7 +1,6 @@
 IndexOptions FancyIndexing DescriptionWidth=*
 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
 AddDescription "generated by <code>cronjobs/parsecommitters.py</code>" groups.json
 AddDescription "generated by <code>cronjobs/parsecommitters.py</code>" people.json
@@ -10,3 +9,4 @@ AddDescription "generated by <code>cronj
 AddDescription "generated by <code>cronjobs/podlings.py</code>" podlings-evolution.json
 AddDescription "imported with <code>import/rdfparse.py</code> from <a href='https://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/files.xml'>projects'
DOAP files</a>" projects.json
 AddDescription "generated by <code>cronjobs/parsereleases.py</code>" releases.json
+AddDescription "imported with <code>import/parsecommittees.py</code>" tlps-evolution.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=1678532&r1=1678531&r2=1678532&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/HEADER.html (original)
+++ comdev/projects.apache.org/site/json/foundation/HEADER.html Sun May 10 00:40:01 2015
@@ -5,11 +5,11 @@ for more information.
 <ul>
 <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>
 <li><a href="groups.json"><code>groups.json</code></a> and
<a href="people.json"><code>people.json</code></a> generated by <code>cronjobs/parsecommitters.py</code>
from <a href="http://people.apache.org/committer-index.html">http://people.apache.org/committer-index.html</a></li>
 <li><a href="pmcs.json"><code>pmcs.json</code></a> imported
with <code>import/parsepmcs.py</code> from <a href='https://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/data_files/'>PMC
DOAP files</a></li>
 <li><a href="podlings.json"><code>podlings.json</code></a>
and <a href="podlings-evolution.json"><code>podlings-evolution.json</code></a>
generated by <code>cronjobs/podlings.py</code> from <a href="http://incubator.apache.org/podlings.xml">http://incubator.apache.org/podlings.xml</a></li>
 <li><a href="projects.json"><code>projects.json</code></a>
imported with <code>import/rdfparse.py</code> from <a href='https://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/files.xml'>projects'
DOAP files</a></li>
 <li><a href="releases.json"><code>releases.json</code></a>
generated by <code>cronjobs/parsereleases.py</code> from <a href="http://www.apache.org/dist/">http://www.apache.org/dist/</a></li>
+<li><a href="tlps-evolution.json"><code>tlps-evolution.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>
 </ul>
\ No newline at end of file



Mime
View raw message