svn commit: r1704340 - in /comdev/projects.apache.org: scripts/README.txt scripts/import/parsecommittees.py site/json/foundation/.htaccess site/json/foundation/HEADER.html site/json/foundation/pmcs.json

[se...@apache.org]

Author: sebb
Date: Mon Sep 21 16:03:11 2015
New Revision: 1704340

URL: http://svn.apache.org/viewvc?rev=1704340&view=rev
Log:
Revert 1703934 - pmcs.json is still used by reporter.a.o

Added:
    comdev/projects.apache.org/site/json/foundation/pmcs.json
      - copied unchanged from r1703933, comdev/projects.apache.org/site/json/foundation/pmcs.json
Modified:
    comdev/projects.apache.org/scripts/README.txt
    comdev/projects.apache.org/scripts/import/parsecommittees.py
    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=1704340&r1=1704339&r2=1704340&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/README.txt (original)
+++ comdev/projects.apache.org/scripts/README.txt Mon Sep 21 16:03:11 2015
@@ -38,6 +38,7 @@ various sources:
     + data/committees/*.rdf - local PMC description RDF files
   out: site/json/foundation/committees.json (updated)
      + site/json/foundation/committees-retired.json (updated)
+     + site/json/foundation/pmcs.json - (used by reporter.a.o only)
      + site/doap/{committeeId}/pmc-doap.rdf - this is an exact copy of the file listed in data/committees.xml
      + site/doap/{committeeId}/pmc.rdf - TODO: what purpose does this serve?
 

Modified: comdev/projects.apache.org/scripts/import/parsecommittees.py
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/import/parsecommittees.py?rev=1704340&r1=1704339&r2=1704340&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/import/parsecommittees.py (original)
+++ comdev/projects.apache.org/scripts/import/parsecommittees.py Mon Sep 21 16:03:11 2015
@@ -21,7 +21,7 @@ Updates:
 ../../site/json/foundation/committees-retired.json
 
 Writes:
-../../site/doap/<committeeId>/pmc.rdf
+../../site/json/foundation/pmcs.json
 """
 
 # Committee names from committees-info.txt that do not match committees-evolution.json
@@ -85,6 +85,7 @@ def handleChild(el):
 
 # get PMC Data from /data/committees.xml
 print("reading PMC Data (/data/committees.xml)")
+pmcs = {}
 pmcDataUrls = {} # id -> url
 with open("../../data/committees.xml", "r") as f:
     xmldoc = minidom.parseString(f.read())
@@ -122,6 +123,8 @@ for s in itemlist :
             else:
                 pmcjson[k] = v
 
+        pmcs[committeeId] = pmcjson
+
         # copy PMC RDF data to /doap/{committeeId}/pmc-doap.rdf
         if type(rdf) is str:
             mode = "w"
@@ -246,6 +249,7 @@ for pmc in re.findall(r"\* .+?\s+\(est\.
             committers.sort()
             pmc.sort()
             # don't store committers and PMC members arrays in committee: it's easy to get from groups.json
+            #committee['pmcs'] = pmc
             #committee['committers'] = committers
             if len(pmc) == 0:
                 print('WARN: %s (%s established in %s) has no PMC members LDAP group (id=%s)' % (committeeId, committeeName, committee['established'], pmcgroup))
@@ -332,3 +336,8 @@ print("Writing json/foundation/committee
 with open("../../site/json/foundation/committees-retired.json", "w") as f:
     json.dump(committeesRetired, f, sort_keys=True, indent=0)
     f.close()
+
+print("Writing json/foundation/pmcs.json...")
+with open ("../../site/json/foundation/pmcs.json", "w") as f:
+    f.write(json.dumps(pmcs, sort_keys=True, indent=0))
+    f.close()

Modified: comdev/projects.apache.org/site/json/foundation/.htaccess
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/json/foundation/.htaccess?rev=1704340&r1=1704339&r2=1704340&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/.htaccess (original)
+++ comdev/projects.apache.org/site/json/foundation/.htaccess Mon Sep 21 16:03:11 2015
@@ -4,6 +4,8 @@ AddDescription "imported with <code>impo
 AddDescription "generated by <code>cronjobs/parsecommitters.py</code>" groups.json
 AddDescription "generated by <code>cronjobs/parsecommitters.py</code>" people.json
 AddDescription "generated by <code>cronjobs/parsecommitters.py</code>" people_name.json
+AddDescription "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>" pmcs.json
+AddDescription "imported with <code>import/parsecommittees.py</code>" pmcs.json
 AddDescription "generated by <code>cronjobs/podlings.py</code>" podlings.json
 AddDescription "generated by <code>cronjobs/podlings.py</code>" podlings-history.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

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=1704340&r1=1704339&r2=1704340&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/HEADER.html (original)
+++ comdev/projects.apache.org/site/json/foundation/HEADER.html Mon Sep 21 16:03:11 2015
@@ -9,5 +9,6 @@ for more information.
 <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="committees.json"><code>committees.json</code></a> and <a href="committees-retired.json"><code>committees-retired.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><i><a href="pmcs.json"><code>pmcs.json</code></a> imported with <code>import/parsecommittees.py</code> from <a href='https://svn.apache.org/repos/asf/comdev/projects.apache.org/data/committees.xml'>PMC DOAP files</a> (not used any more, replaced by committees.json)</i></li>
 </ul>
 <code><a href="http://svn.apache.org/viewvc/comdev/projects.apache.org/site/json/foundation/">site/json/foundation</a></code>
\ No newline at end of file