Changeset d859737 in sasview

Timestamp:

Feb 25, 2015 9:53:21 AM (10 years ago)

Author:

Doucet, Mathieu <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:

ce15ce4

Parents:

caf3baa6

Message:

Remove svn rev code.

Files:

• build_tools/get_version.py (modified) (3 diffs)
• sasview/__init__.py (modified) (1 diff)

build_tools/get_version.py

@@ -5 +5 @@
 import subprocess
 
-def get_svn_revision():
-    p = subprocess.Popen("svnversion", shell=True, \
+def get_latest_git_commit():
+    p = subprocess.Popen("git rev-parse --short HEAD", shell=True, \
        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (stdout, stderr) = p.communicate()
@@ -14 +14 @@
     except:
         return __revision__
-
+    
 # Get the version number from the sasview module
 # Check to see if we are dealing with a release
@@ -26 +26 @@
 # Get actual revision number if possible
 try:
-    rev = get_svn_revision()
+    rev = get_latest_git_commit()
     if rev is not None:
         __revision__ = rev

sasview/__init__.py

@@ -6 +6 @@
     __build__ = str(d.version)
 except:
-    try:
-        import os
-        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:
-                __build__ = buff
-    except:
-        import logging
-        import sys
-        logging.warning("Error while determining build number\n  %s" % sys.exc_value)
+    import logging
+    import sys
+    logging.warning("Error while determining build number\n  %s" % sys.exc_value)