Changes in / [cfe472e:906a325] in sasview

Files:

• build_tools/get_version.py (added)
• build_tools/jenkins_linux_build.sh (modified) (1 diff)
• build_tools/rpm/create_rpm_spec.py (added)
• build_tools/rpm/sasview.spec.template (added)
• sasview/__init__.py (modified) (1 diff)
• src/sas/perspectives/fitting/fitting.py (modified) (1 diff)

build_tools/jenkins_linux_build.sh

@@ -24 +24 @@
 
 cd $WORKSPACE/dist
-# ln -s sasview*.egg sasview.egg || true
-$EASY_INSTALL -N -d ../sasview-install sasview*.egg
+ln -s sasview*.egg sasview.egg || true
+$EASY_INSTALL -N -d ../sasview-install sasview.egg
 

sasview/__init__.py

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

src/sas/perspectives/fitting/fitting.py

@@ -523 +523 @@
         self.fit_panel.clear_panel()
         
+    def set_default_perspective(self):
+        """
+        Call back method that True to notify the parent that the current plug-in
+        can be set as default perspective.
+        when returning False, the plug-in is not candidate for an automatic
+        default perspective setting
+        """
+        return True
+    
     def delete_data(self, data):
         """