Changeset ba0dc71 in sasview

Timestamp:

Sep 15, 2016 8:33:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

aa6028c

Parents:

70b7d778

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (08/10/16 07:28:08)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)

Message:

Remove cmd window popup and fix a unit test

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