Changeset d2fd8fc in sasview


Ignore:
Timestamp:
Aug 10, 2016 7:28:08 AM (8 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
b61bd57, deddda1, f2f6af9
Parents:
c3e4e213
Message:

Remove cmd window popup and fix a unit test

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • build_tools/jenkins_win_build.bat

    rb188f53 rd2fd8fc  
    1616 
    1717:: SET SASVIEW GITHASH ################################################ 
    18 cd %WORKSPACE% 
    19 cd sasview\sasview 
    20 git rev-parse HEAD > tmpFile_githash 
    21 SET /p githash= < tmpFile_githash 
    22 DEL tmpFile_githash 
    23 %GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py 
     18:: cd %WORKSPACE% 
     19:: cd sasview\sasview 
     20:: git rev-parse HEAD > tmpFile_githash 
     21:: SET /p githash= < tmpFile_githash 
     22:: DEL tmpFile_githash 
     23:: %GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py 
    2424 
    2525 

  • src/sas/sascalc/calculator/sas_gen.py

    rcb4ef58 rd2fd8fc  
    33SAS generic computation and sld file readers 
    44""" 
     5import sas.sascalc.calculator.core.sld2i as mod 
    56from sas.sascalc.calculator.BaseComponent import BaseComponent 
    6 import sas.sascalc.calculator.core.sld2i as mod 
    77from periodictable import formula 
    88from periodictable import nsf 
Note: See TracChangeset for help on using the changeset viewer.