Changes in / [1ed6be7:695ec0b] in sasview

Files:

• build_tools/jenkins_win_build.bat (modified) (1 diff)
• sasview/__init__.py (modified) (1 diff)
• src/sas/sascalc/calculator/BaseComponent.py (modified) (4 diffs)
• src/sas/sascalc/dataloader/readers/associations.py (modified) (2 diffs)

build_tools/jenkins_win_build.bat

@@ -16 +16 @@
 
 :: SET SASVIEW GITHASH ################################################
-:: cd %WORKSPACE%
-:: cd sasview\sasview
-:: git rev-parse HEAD > tmpFile_githash
-:: SET /p githash= < tmpFile_githash
-:: DEL tmpFile_githash
-:: %GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py
+cd %WORKSPACE%
+cd sasview\sasview
+git rev-parse HEAD > tmpFile_githash
+SET /p githash= < tmpFile_githash
+DEL tmpFile_githash
+%GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py
 
 

sasview/__init__.py

@@ -3 +3 @@
 try:
     import subprocess
-    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+    import os
+    FNULL = open(os.devnull, 'w')
+    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+                    stderr=FNULL,
+                    shell=True)
     __build__ = str(git_revision).strip()
 except:

src/sas/sascalc/calculator/BaseComponent.py

@@ -7 +7 @@
 # imports
 import copy
+from collections import OrderedDict
+
 import numpy
 #TO DO: that about a way to make the parameter
@@ -254 +256 @@
         Return a list of all available parameters for the model
         """
-        list = self.params.keys()
+        list = _ordered_keys(self.params)
         # WARNING: Extending the list with the dispersion parameters
         list.extend(self.getDispParamList())
@@ -264 +266 @@
         """
         list = []
-
-        for item in self.dispersion.keys():
-            for p in self.dispersion[item].keys():
+        for item in _ordered_keys(self.dispersion):
+            for p in _ordered_keys(self.dispersion[item]):
                 if p not in ['type']:
                     list.append('%s.%s' % (item.lower(), p.lower()))
@@ -309 +310 @@
         """
         raise ValueError, "Model operation are no longer supported"
+
+
+def _ordered_keys(d):
+    keys = list(d.keys())
+    if not isinstance(d, OrderedDict):
+        keys.sort()
+    return keys

src/sas/sascalc/dataloader/readers/associations.py

@@ -92 +92 @@
     import nexus_reader
     import sesans_reader
+    import cansas_reader_HDF5
+    import anton_paar_saxs_reader
     registry_function(sesans_reader)
     registry_function(abs_reader)
@@ -102 +104 @@
     #registry_function(tiff_reader)
     registry_function(nexus_reader)
-    
+    registry_function(cansas_reader_HDF5)
+    registry_function(anton_paar_saxs_reader)
     return True