From 2357cb427f2344e3fbe726882d320913c3143ae6 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Wed, 24 Dec 2014 11:00:00 -0500
Subject: [PATCH] correction for setup version string detection

---
 tools/setupHelpers.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py
index b308b226..ef711b84 100644
--- a/tools/setupHelpers.py
+++ b/tools/setupHelpers.py
@@ -360,12 +360,9 @@ def getGitVersion(tagPrefix):
         
     # Find last tag matching "tagPrefix.*"
     tagNames = check_output(['git', 'tag'], universal_newlines=True).strip().split('\n')
-    while True:
-        if len(tagNames) == 0:
-            raise Exception("Could not determine last tagged version.")
-        lastTagName = tagNames.pop()
-        if re.match(tagPrefix+r'\d+\.\d+.*', lastTagName):
-            break
+    tagNames = [x for x in tagNames if re.match(tagPrefix + r'\d+\.\d+\..*', x)]
+    tagNames.sort(key=lambda s: map(int, s[len(tagPrefix):].split('.')))
+    lastTagName = tagNames[-1]
     gitVersion = lastTagName.replace(tagPrefix, '')
     
     # is this commit an unchanged checkout of the last tagged version?