Changeset 637

Timestamp:

12/04/16 15:48:15 (4 years ago)

Author:

mjuckes

Message:

updated step1 to use parse_version from pkg_resources

File:

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

CMIP6dreq/manage/step1.py

@@ -10 +10 @@
 """
 
+from pkg_resources import parse_version
 import sys, os, glob, string, time
 if os.path.isfile( 'step2.sh' ):
@@ -37 +38 @@
   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
+  assert len(bits) in [2,3,4], estr
   if len( bits ) == 3:
     assert bits[1] in ['alpha','beta'], estr
@@ -68 +69 @@
 thiscomment = sys.argv[1]
 thistag = version
-thistn = tuple( f1( version ) )
+thistn = parse_version( version )
 if len(tags) > 0:
-  tn = map( lambda x: tuple( f1(string.split(x,'/')[-1]) ),  tags )
-  tn.sort(tcmp)
+  tn = map( parse_version,  tags )
+  tn.sort()
   assert thistn > tn[-1], 'Requested tag not greater than last tag: %s' % str(tn[-1])
 
@@ -87 +88 @@
 svn ci -m "Updated setup for tag %(thistag)s"
 svn copy %(svnBaseUrl)s/trunk %(svnBaseUrl)s/tags/%(thistag)s -m "%(thiscomment)s"
+
+## cd %(svnBaseUrl)s/tags
+## svn del latest
+## svn ci -m "removed latest"
+#svn copy   %(svnBaseUrl)s/tags/%(thistag)s  %(svnBaseUrl)s/tags/latest
 """