Changes in / [b6f5ad1c:5a3c1f0] in sasview

Files:

• build_tools/jenkins_win_build.bat (modified) (1 diff)
• src/sas/sascalc/calculator/sas_gen.py (modified) (1 diff)

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
 
 

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