Changeset 6f44bfb in sasview

Timestamp:

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

f6f0c7b

Parents:

7680760

Message:

Re #3 Refactoring version handling

Files:

• build_tools/get_version.py (modified) (2 diffs)
• build_tools/rpm/create_rpm_spec.py (modified) (3 diffs)
• sansview/__init__.py (modified) (1 diff)

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"
+    

build_tools/rpm/create_rpm_spec.py

@@ -4 +4 @@
 
 revision = get_version.__revision__
-if len(sys.argv)>1:
+
+# If the revision we got from get_version is None, it's because it's
+# release. Otherwise, use the input revision if provided
+if len(sys.argv)>1 and revision is not None:
     try:
         revision = int(sys.argv[1].strip())
@@ -26 +29 @@
     return newline
 
-
 input=open("sansview.spec.template",'r')
 output=open("sansview.spec",'w')
@@ -35 +37 @@
     new_line = replaceToken(l, "[VERSION]", get_version.__version__)
     new_line = replaceToken(new_line, "[REVISION]", str(revision))
+    
+    # If this is a release, the revision number will come out as None
+    if revision is None and new_line.find("Release")>=0:
+        continue
+    
     output.write(new_line+'\n')
     

sansview/__init__.py

@@ -1 @@
-__version__ = "0.0.0"
+__version__ = "2.0.1"
+__is_release__ = False