Changes in / [e5c09cf:713cc1c] in sasview

Files:

• sasview/__init__.py (modified) (1 diff)
• sasview/setup_exe.py (modified) (2 diffs)
• src/sas/sascalc/calculator/BaseComponent.py (modified) (4 diffs)
• src/sas/sascalc/calculator/sas_gen.py (modified) (1 diff)

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:

sasview/setup_exe.py

@@ -242 +242 @@
 if os.path.isfile(f):
     data_files.append(('.', [f]))
+
+# atlas DLL required by matplotlib 11.1
+# ** REVISIT WHEN MOVING TO ANACONDA **
+f = "c:\\python27\\lib\\site-packages\\numpy\\core\\numpy-atlas.dll"
+if os.path.isfile(f):
+    data_files.append(('.', [f]))
     
 if os.path.isfile("BUILD_NUMBER"):
@@ -332 +338 @@
     # numpy 1.8 openmp bindings (still seems to use all the cores without them)
     #'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll',
+    'numpy-atlas.dll',
     # microsoft C runtime (not allowed to ship with the app; need to ship vcredist
     'msvcp90.dll',

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/calculator/sas_gen.py

@@ -3 +3 @@
 SAS generic computation and sld file readers
 """
+import sas.sascalc.calculator.core.sld2i as mod
 from sas.sascalc.calculator.BaseComponent import BaseComponent
-import sas.sascalc.calculator.core.sld2i as mod
 from periodictable import formula
 from periodictable import nsf