Changeset b44da61 in sasview


Ignore:
Timestamp:
Dec 5, 2014 5:12:26 PM (9 years ago)
Author:
pkienzle
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:
55cc5cf
Parents:
3d669e1
Message:

bump bumps required version to 0.7.5.4 so that fits to sld parameters will work

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • build_tools/jenkins_linux_build.sh

    rafd42432 rb44da61  
    1515rm -rf build 
    1616 
    17 "$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.3 
     17"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.4 
    1818"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0 
    1919 

  • build_tools/jenkins_rhel6_build.sh

    rafd42432 rb44da61  
    2828"$EASY_INSTALL" -d "$WORKSPACE/utils" lxml 
    2929"$EASY_INSTALL" -d "$WORKSPACE/utils" pyparsing==1.5.5 
    30 "$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.3 
     30"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.4 
    3131"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0 
    3232python deps.py 

  • build_tools/jenkins_win32_build.bat

    rafd42432 rb44da61  
    1616RD /S /Q build 
    1717 
    18 rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.3 
     18rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.4 
    1919rem PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0 
    2020rem %PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5 

  • check_packages.py

    r1447af3 rb44da61  
    1414    'pylint':{'version':None,'import_name':'pylint','test':None}, 
    1515    'periodictable':{'version':'1.3.0','import_name':'periodictable','test':'__version__'}, 
    16     'bumps':{'version':'0.7.5.3','import_name':'bumps','test':'__version__'}, 
     16    'bumps':{'version':'0.7.5.4','import_name':'bumps','test':'__version__'}, 
    1717    'numpy':{'version':'1.6.1','import_name':'numpy','test':'__version__'}, 
    1818    'scipy':{'version':'0.10.1','import_name':'scipy','test':'__version__'}, 

  • setup.py

    r9729a6d rb44da61  
    347347 
    348348required = [ 
    349     'bumps>=0.7.5.3', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 
     349    'bumps>=0.7.5.4', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 
    350350 
    351351    # 'lxml>=2.2.2', 
Note: See TracChangeset for help on using the changeset viewer.