Merge pull request #1740 from tardyp/betarelease

Betarelease

common/maketarballs.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+find . -name VERSION -exec rm {} \;
+rm -rf dist
+mkdir dist
+for pkg in pkg master slave pkg www/base www/console_view www/waterfall_view
+do
+  pip install -e ${pkg}
+  (
+    cd ${pkg}
+    rm -rf dist
+    python setup.py sdist
+  )
+  cp ${pkg}/dist/* dist/
+  pip wheel ${pkg} -w dist
+done

master/buildbot/__init__.py

@@ -17,10 +17,15 @@
 #
 # We can't put this method in utility modules, because they import dependancy packages
 #
-from subprocess import Popen, PIPE, STDOUT
+from __future__ import with_statement
+
 import os
 import re
 
+from subprocess import PIPE
+from subprocess import Popen
+from subprocess import STDOUT
+
 
 def getVersion(init_file):
     """
@@ -43,7 +48,7 @@ def getVersion(init_file):
 
     # accept version to be coded with 2 or 3 parts (X.Y or X.Y.Z),
     # no matter the number of digits for X, Y and Z
-    VERSION_MATCH = re.compile(r'(\d+\.\d+(\.\d+)?)(\w|-)*')
+    VERSION_MATCH = re.compile(r'(\d+\.\d+(\.\d+)?(\w|-)*)')
 
     try:
         p = Popen(['git', 'describe', '--tags', '--always'], stdout=PIPE, stderr=STDOUT, cwd=cwd)

pkg/buildbot_pkg.py

@@ -50,7 +50,7 @@ def getVersion(init_file):
 
     # accept version to be coded with 2 or 3 parts (X.Y or X.Y.Z),
     # no matter the number of digits for X, Y and Z
-    VERSION_MATCH = re.compile(r'(\d+\.\d+(\.\d+)?)(\w|-)*')
+    VERSION_MATCH = re.compile(r'(\d+\.\d+(\.\d+)?(\w|-)*)')
 
     try:
         p = Popen(['git', 'describe', '--tags', '--always'], stdout=PIPE, stderr=STDOUT, cwd=cwd)

slave/buildslave/__init__.py

@@ -18,10 +18,14 @@
 # We can't put this method in utility modules, because they import dependancy packages
 #
 from __future__ import with_statement
-from subprocess import Popen, PIPE, STDOUT
+
 import os
 import re
 
+from subprocess import PIPE
+from subprocess import Popen
+from subprocess import STDOUT
+
 
 def getVersion(init_file):
     """
@@ -44,7 +48,7 @@ def getVersion(init_file):
 
     # accept version to be coded with 2 or 3 parts (X.Y or X.Y.Z),
     # no matter the number of digits for X, Y and Z
-    VERSION_MATCH = re.compile(r'(\d+\.\d+(\.\d+)?)(\w|-)*')
+    VERSION_MATCH = re.compile(r'(\d+\.\d+(\.\d+)?(\w|-)*)')
 
     try:
         p = Popen(['git', 'describe', '--tags', '--always'], stdout=PIPE, stderr=STDOUT, cwd=cwd)