0.91-beta! Fixed version notify, and release scripts

ArmoryQt.py

@@ -1669,7 +1669,7 @@ def notificationIsRelevant(self, notifyID, notifyMap):
          maxExclude = maxVerStr.startswith('<')
          maxVerStr  = maxVerStr[1:] if maxExclude else maxVerStr
          maxVerInt  = getVersionInt(readVersionString(maxVerStr))
-         minVerInt -= 1 if gtstrict else 0
+         maxVerInt -= 1 if maxExclude else 0
          if thisVerInt > maxVerInt:
             return False
       except:

armoryengine/ArmoryUtils.py

@@ -41,7 +41,7 @@
 
 
 # Version Numbers
-BTCARMORY_VERSION    = (0, 90, 99, 7)  # (Major, Minor, Bugfix, AutoIncrement)
+BTCARMORY_VERSION    = (0, 91,  0, 0)  # (Major, Minor, Bugfix, AutoIncrement)
 PYBTCWALLET_VERSION  = (1, 35,  0, 0)  # (Major, Minor, Bugfix, AutoIncrement)
 
 ARMORY_DONATION_ADDR = '1ArmoryXcfq7TnCSuZa9fQjRYwJ4bkRKfv'

release_scripts/Step1_Online_PrepareForSigning.py

@@ -1 +1,25 @@
 # stub
+import subprocess
+import os
+import time
+import sys
+import shutil
+import ast
+import fetchInstallers
+from release_utils import execAndWait
+
+CLONE_URL = 'https://github.com/etotheipi/BitcoinArmory.git'
+
+verStr   = sys.argv[1]
+typeStr  = sys.argv[2]
+localDir = sys.argv[3]
+
+
+fetchInstallers.doFetch()
+cloneDir = os.path.join(localDir, 'BitcoinArmory')
+rscrDir  = os.path.join(localDir, 'release_scripts')
+
+execAndWait(['git', 'clone', CLONE_URL, cloneDir])
+shutil.copytree('../release_scripts', rscrDir)
+
+

release_scripts/dlmap.txt

@@ -0,0 +1,7 @@
+ArmoryTesting 0.90.99.7 https://s3.amazonaws.com/bitcoinarmory-testing/
+
+armory_%ver-testing_64bit.deb Ubuntu 12.04,12.10,13.04,13.10,14.10 64
+armory_%ver-testing_32bit.deb Ubuntu 12.04,12.10,13.04,13.10,14.10 32
+armory_%ver-testing_osx.tar.gz MacOSX 10.7,10.8,10.9,10.9.1,10.9.2 64
+armory_%ver-testing_raspbian.tar.gz RaspberryPi Raspbian(armhf) 32
+armory_%ver-testing_winAll.exe Windows XP,Vista,7,8,8.1 32,64

release_scripts/fetchInstallers.py

@@ -0,0 +1,43 @@
+import subprocess
+import os
+import time
+import sys
+import shutil
+import ast
+from release_utils import execAndWait
+
+verStr   = sys.argv[1]
+typeStr  = sys.argv[2]
+localDir = sys.argv[3]
+
+
+
+def doFetch():
+
+   fetchList = ast.literal_eval(open('fetchlist.txt','r').read().strip())
+
+   if os.path.exists(localDir):
+      shutil.rmtree(localDir)
+   os.mkdir(localDir)
+
+
+   for cmd,cplist in fetchList.iteritems():
+      if cmd=='cp':
+         for src,dst in cplist:
+            src_ = src%verStr
+            dst_ = os.path.join(localDir, dst%(verStr,typeStr))
+            print 'Copying: %s --> %s' % (src_,dst_)
+            shutil.copy(src_,dst_)
+      if cmd=='scp':
+         for usr,ip,port,path,rllist in cplist:
+            for rem,loc in rllist:
+
+               remotePath = os.path.join(path, rem%verStr)
+               hostPath = '%s@%s:%s' % (usr,ip,remotePath)
+               localPath  = os.path.join(localDir, loc % (verStr,typeStr))
+
+               cmdList = ['scp', '-P', str(port), hostPath, localPath]
+               #print ' '.join(cmdList)
+               execAndWait(cmdList)
+
+

release_scripts/release_utils.py

@@ -12,6 +12,9 @@ def execAndWait(cli_str, timeout=0, usepipes=True):
    would've been more appropriate.  But I didn't know about check_output at 
    the time...
    """
+   if isinstance(cli_str, (list, tuple)):
+      cli_str = ' '.join(cli_str)
+   print 'Executing:', '"' + cli_str + '"'
    if usepipes:
       process = Popen(cli_str, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True)
    else:

signannounce/signfiles.py → release_scripts/signfiles.py

@@ -3,6 +3,7 @@
 import getpass
 import shutil
 sys.path.append('..')
+sys.path.append('/usr/lib/armory')
 
 from armoryengine.ALL import *
 from jasvet import ASv1CS, readSigBlock, verifySignature
@@ -18,8 +19,8 @@
    exit(1)
 
 
-inDir = 'rawFiles'
-outDir = 'filesToAnnounce'
+inDir = 'unsignedAnnounce'
+outDir = 'signedAnnounce'
 
 origDLFile = os.path.join(inDir, 'dllinks.txt')
 newDLFile = os.path.join(inDir, 'dllinks_temp.txt')