Changeset 359

Timestamp:

27/07/15 09:14:32 (7 years ago)

Author:

mjuckes

Message:

adapted 'step1.py' to handle alpha and beta

File:

• CMIP6dreq/manage/step1.py (modified) (2 diffs)

CMIP6dreq/manage/step1.py

@@ -18 +18 @@
 tags = glob.glob( '../tags/*' )
 f1 = lambda x: map( int, string.split(x, '.' ) )
-tn = map( lambda x: tuple( f1(string.split(x,'/')[-1]) ),  tags )
-tn.sort()
+def f1( vs ):
+  bits = string.split(vs, '.' )
+  estr = 'Version string should be "nn.nn" or "nn.[alpha|beta].nn": %s' % vs
+  assert len(bits) in [2,3], estr
+  if len( bits ) == 3:
+    assert bits[1] in ['alpha','beta'], estr
+  assert len(bits[0]) == 2 and len(bits[-1]) == 2, estr
+  bits[0] = int( bits[0] )
+  bits[-1] = int( bits[-1] )
+  return bits
+
+def tcmp(t1,t2):
+  if len(t1) != len(t2):
+    if t1[0] == t2[0]:
+      return cmp( len(t1), len(t2) )
+    else:
+      return cmp( t1[0], t2[0] )
+  elif len(t1) == 2:
+    if t1[0] == t2[0]:
+      return cmp( t1[1], t2[1] )
+    else:
+      return cmp( t1[0], t2[0] )
+  elif len(t1) == 3:
+    if t1[0] == t2[0]:
+      if t1[1] == t2[1]:
+        return cmp( t1[2], t2[2] )
+      else:
+        return cmp( t1[1], t2[1] )
+    else:
+      return cmp( t1[0], t2[0] )
+    
 thistag, thiscomment = sys.argv[1:]
 thistn = tuple( f1( thistag ) )
-assert thistn > tn[-1], 'Requested tag not greater than last tag: %s' % str(tn[-1])
+if len(tags) > 0:
+  tn = map( lambda x: tuple( f1(string.split(x,'/')[-1]) ),  tags )
+  tn.sort(tcmp)
+  assert thistn > tn[-1], 'Requested tag not greater than last tag: %s' % str(tn[-1])
 
 oo = open( '../trunk/src/versionConfig.py', 'w' )
@@ -36 +68 @@
 cd ../trunk
 svn ci -m "Updated setup for tag %(thistag)s"
-svn copy %(svnBaseUrl)/trunk %(svnBaseUrl)/tags/%(thistag)s -m "%(thiscomment)s"
+svn copy %(svnBaseUrl)s/trunk %(svnBaseUrl)s/tags/%(thistag)s -m "%(thiscomment)s"
 """