Changeset 5709051 in sasview

Timestamp:

Mar 7, 2013 3:16:04 PM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a602942e

Parents:

0d795bf

Message:

Improved version handling

Files:

• build_tools/get_version.py (modified) (2 diffs)
• build_tools/jenkins_rhel6_build.sh (added)
• sansview/__init__.py (modified) (1 diff)
• setup.py (modified) (1 diff)

build_tools/get_version.py

@@ -3 +3 @@
 __version__ = "0.0.0"
     
-def get_svn_revision(path=None):
-    rev = None
-    if path is None:
-        path = os.path.dirname(__file__)
-    entries_path = '%s/.svn/entries' % path
+import subprocess
 
-    if os.path.exists(entries_path):
-        entries = open(entries_path, 'r').read()
-        # Versions >= 7 of the entries file are flat text.  The first line is
-        # the version number. The next set of digits after 'dir' is the revision.
-        if re.match('(\d+)', entries):
-            rev_match = re.search('\d+\s+dir\s+(\d+)', entries)
-            if rev_match:
-                rev = rev_match.groups()[0]
-        # Older XML versions of the file specify revision as an attribute of
-        # the first entries node.
-        else:
-            from xml.dom import minidom
-            dom = minidom.parse(entries_path)
-            rev = dom.getElementsByTagName('entry')[0].getAttribute('revision')
-
-    if rev:
-        return u'%s' % rev
-    return None
+def get_svn_revision():
+    p = subprocess.Popen("svnversion", shell=True, \
+       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    (stdout, stderr) = p.communicate()
+    try:
+        rev = int(stdout.strip())
+        return str(rev)
+    except:
+        return __revision__
 
 # Get the version number from the sansview module
@@ -46 +33 @@
 
 
-print "SasView v ", __version__, __revision__
+print "SasView v", __version__, __revision__

sansview/__init__.py

@@ -3 +3 @@
 try:
     import pkg_resources
-    d = pkg_resources.get_distribution("sansview")
-    rev = int(d.parsed_version[5])
-    __build__ = str(rev)
+    d = pkg_resources.get_distribution("sasview")
+    __build__ = str(d.version)
 except:
     try:
         import os
-        if os.path.isfile("BUILD_NUMBER"):
-            f=open("BUILD_NUMBER",'r')
+        dir = os.path.dirname(__file__)
+        filepath = os.path.join(dir, "BUILD_NUMBER")
+        if os.path.isfile(filepath):
+            f=open(filepath, 'r')
             buff = f.read().strip()
             if len(buff)<50:

setup.py

@@ -331 +331 @@
 #            'wxPython>=2.8.11', 'pil',
 #            'periodictable>=1.3.0', 'scipy>=0.7.2']
-required = ['lxml','periodictable>=1.3.0','pyparsing==1.5.5']
+required = ['lxml','periodictable>=1.3.0','pyparsing<2.0.0']
 
 if os.name=='nt':