Changeset 6f44bfb in sasview for build_tools/get_version.py

Timestamp:

Dec 16, 2011 9:14:27 AM (12 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:

f6f0c7b

Parents:

7680760

Message:

Re #3 Refactoring version handling

File:

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

build_tools/get_version.py

@@ -1 +1 @@
 __revision__ = filter(str.isdigit, "$Revision$")
 __version__ = "0.0.0"
-try:
-    import sans.sansview
-    __version__ = sans.sansview.__version__
-except:
-    print "Could not load sansview module"
     
 def get_svn_revision(path=None):
@@ -40 +35 @@
     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__
     
+    if sans.sansview.__is_release__:
+        __revision__ = None
+except:
+    print "Could not load sansview module"
+