Changeset 0cbdaf0 in sasview

Timestamp:

Dec 16, 2011 2:13:53 PM (13 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:

5fe019f

Parents:

8d2f5bb

Message:

Re #3 improve versioning

File:

• build_tools/get_version.py (modified) (3 diffs)

build_tools/get_version.py

@@ -1 +1 @@
 import os
-__revision__ = filter(str.isdigit, "$Revision$")
+__revision__ = "0"
 __version__ = "0.0.0"
     
@@ -28 +28 @@
     return None
 
+# Get the version number from the sansview module
+# Check to see if we are dealing with a release
+try:
+    import sans.sansview
+    __version__ = sans.sansview.__version__
+    __revision__ = sans.sansview.__build__
+except:
+    print "Could not load sansview module"
+
 # Get actual revision number if possible
 try:
@@ -36 +45 @@
     print "Could not extract revision number"
 
-# Get the version number from the sansview module
-# Check to see if we are dealing with a release
-try:
-    import sans.sansview
-    __version__ = sans.sansview.__version__
-except:
-    print "Could not load sansview module"
-    
+
 print "SansView v ", __version__, __revision__