Changeset 505


Ignore:
Timestamp:
21/11/15 08:17:20 (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/out/dreq2Defn.xml

    r502 r505  
    44xmlns="urn:w3id.org:cmip6.dreq.framework:a" 
    55xsi:schemaLocation="http://w3id.org/cmip6dr/ns vocabFrameworkSchema_v01beta.xsd"> 
    6 <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"> 
    7   <rowAttribute label="label" type="xs:string" title="Record Label" uid="4148f9aa-8f8d-11e5-b7b2-ac72891c3257"/> 
    8   <rowAttribute label="title" type="xs:string" title="Record Title" uid="4148fc66-8f8d-11e5-b7b2-ac72891c3257"/> 
     6<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"> 
     7  <rowAttribute label="label" type="xs:string" title="Record Label" uid="d23bcec6-8fa4-11e5-a341-ac72891c3257"/> 
     8  <rowAttribute label="title" type="xs:string" title="Record Title" uid="d23c0a76-8fa4-11e5-a341-ac72891c3257"/> 
    99  <rowAttribute label="label" type="xs:string" title="Record Label" useClass="" techNote="" description="" uid="" superclass=""/> 
    1010  <rowAttribute label="title" type="xs:string" title="Record Title" useClass="" techNote="" description="" uid="" superclass=""/> 
     
    1414  <rowAttribute label="refNote" type="xs:string" title="" useClass="" techNote="" description="" uid="" superclass=""/> 
    1515</table> 
    16 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"> 
     16<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"> 
    1717  <rowAttribute label="label" type="xs:string" title="Record Label" uid="d23c57b0-8fa4-11e5-a341-ac72891c3257"/> 
    1818  <rowAttribute label="title" type="xs:string" title="Record Title" uid="d23c931a-8fa4-11e5-a341-ac72891c3257"/> 
  • CMIP6dreqbuild/trunk/src/framework/vrev.py

    r493 r505  
    1010  def __init__(self,dq): 
    1111    self.dq = dq 
    12     self.mips = {i.label for i in  dq.coll['mip'].items} 
     12    self.mips = set( [i.label for i in  dq.coll['mip'].items] ) 
    1313    for i in ['PDRMIP', 'DECK', 'VIACSAB', 'SolarMIP', 'CMIP6' ]: 
    1414      self.mips.discard(i) 
     
    4141 
    4242## filter out the ones which link to a remark 
    43     s0 = {i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks'} 
     43    s0 = set( [i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks' ] ) 
    4444 
    4545## set of request groups 
    4646 
    47     s1  = {dq.inx.uid[i].vgid for i in s0} 
     47    s1  = set( [dq.inx.uid[i].vgid for i in s0 ] ) 
    4848 
    4949    #s2 = set() 
     
    5353    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')] ) 
    5454 
    55     mips = {dq.inx.uid[i].mip for i in s2} 
     55    mips = set( [dq.inx.uid[i].mip for i in s2 ] ) 
    5656    self.missing = self.mips.difference( mips ) 
    5757    self.inc = mips 
     
    6464## filter out the ones whch link to a remark 
    6565 
    66     s0 = {i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks'} 
     66    s0 = set( [i for i in s if dq.inx.uid[dq.inx.uid[i].vgid]._h.label != 'remarks' ] ) 
    6767 
    6868## set of request groups 
    6969 
    70     s1  = {dq.inx.uid[i].vgid for i in s0} 
     70    s1  = set( [dq.inx.uid[i].vgid for i in s0 ] ) 
    7171 
    7272    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')] 
Note: See TracChangeset for help on using the changeset viewer.