Changeset 505 for CMIP6dreqbuild/trunk/src

Timestamp:

21/11/15 08:17:20 (7 years ago)

Author:

mjuckes

Message:

bringing back mods for python 2.6.6 in makeTables, cleaning new xls config stream

Location:

CMIP6dreqbuild/trunk/src/framework

Files:

• out/dreq2Defn.xml (modified) (2 diffs)
• vrev.py (modified) (4 diffs)

CMIP6dreqbuild/trunk/src/framework/out/dreq2Defn.xml

@@ -4 +4 @@
 xmlns="urn:w3id.org:cmip6.dreq.framework:a"
 xsi:schemaLocation="http://w3id.org/cmip6dr/ns vocabFrameworkSchema_v01beta.xsd">
-<table label="requestVarGroup" uid="SECTION:requestVarGroup" title="3.1 Request variable group: a collection of request variables" id="cmip.drv.008" itemLabelMode="def" level="3.0" maxOccurs="1.0" labUnique="Yes">
-  <rowAttribute label="label" type="xs:string" title="Record Label" uid="4148f9aa-8f8d-11e5-b7b2-ac72891c3257"/>
-  <rowAttribute label="title" type="xs:string" title="Record Title" uid="4148fc66-8f8d-11e5-b7b2-ac72891c3257"/>
+<table label="requestVarGroup" uid="SECTION:requestVarGroup" title="3.1 Request variable group: a collection of request variables" id="cmip.drv.008" itemLabelMode="def" level="3" maxOccurs="1" labUnique="Yes">
+  <rowAttribute label="label" type="xs:string" title="Record Label" uid="d23bcec6-8fa4-11e5-a341-ac72891c3257"/>
+  <rowAttribute label="title" type="xs:string" title="Record Title" uid="d23c0a76-8fa4-11e5-a341-ac72891c3257"/>
   <rowAttribute label="label" type="xs:string" title="Record Label" useClass="" techNote="" description="" uid="" superclass=""/>
   <rowAttribute label="title" type="xs:string" title="Record Title" useClass="" techNote="" description="" uid="" superclass=""/>
@@ -14 +14 @@
   <rowAttribute label="refNote" type="xs:string" title="" useClass="" techNote="" description="" uid="" superclass=""/>
 </table>
-le label="requestItem" uid="SECTION:requestItem" title="3.2 Request Item: specifying the number of years for an experiment" id="cmip.drv.010" itemLabelMode="def" level="5" maxOccurs="1" labUnique="No">
+<table label="requestItem" uid="SECTION:requestItem" title="3.2 Request Item: specifying the number of years for an experiment" id="cmip.drv.010" itemLabelMode="def" level="5" maxOccurs="1" labUnique="No">
   <rowAttribute label="label" type="xs:string" title="Record Label" uid="d23c57b0-8fa4-11e5-a341-ac72891c3257"/>
   <rowAttribute label="title" type="xs:string" title="Record Title" uid="d23c931a-8fa4-11e5-a341-ac72891c3257"/>

CMIP6dreqbuild/trunk/src/framework/vrev.py

@@ -10 +10 @@
   def __init__(self,dq):
     self.dq = dq
-    self.mips = {i.label for i in  dq.coll['mip'].items}
+    self.mips = set( [i.label for i in  dq.coll['mip'].items] )
     for i in ['PDRMIP', 'DECK', 'VIACSAB', 'SolarMIP', 'CMIP6' ]:
       self.mips.discard(i)
@@ -41 +41 @@
 
 ## filter out the ones which link to a remark
-    s0 = {i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks'}
+    s0 = set( [i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks' ] )
 
 ## set of request groups
 
-    s1  = {dq.inx.uid[i].vgid for i in s0}
+    s1  = set( [dq.inx.uid[i].vgid for i in s0 ] )
 
     #s2 = set()
@@ -53 +53 @@
     s2 = reduce( operator.or_, [set(dq.inx.iref_by_sect[i].a['requestLink']) for i in s1 if dq.inx.iref_by_sect[i].a.has_key('requestLink')] )
 
-    mips = {dq.inx.uid[i].mip for i in s2}
+    mips = set( [dq.inx.uid[i].mip for i in s2 ] )
     self.missing = self.mips.difference( mips )
     self.inc = mips
@@ -64 +64 @@
 ## filter out the ones whch link to a remark
 
-    s0 = {i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks'}
+    s0 = set( [i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks' ] )
 
 ## set of request groups
 
-    s1  = {dq.inx.uid[i].vgid for i in s0}
+    s1  = set( [dq.inx.uid[i].vgid for i in s0 ] )
 
     ll = [set(dq.inx.iref_by_sect[i].a['requestLink']) for i in s1 if dq.inx.iref_by_sect[i].a.has_key('requestLink')]