Changeset 38a8c4c in sasview


Ignore:
Timestamp:
Sep 26, 2014 2:37:49 PM (10 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:
291ef3b
Parents:
a91bc5d
Message:

remove numdifftools requirement (it is now bundled with bumps 0.7.5.2)

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • build_tools/jenkins_linux_build.sh

    r24a6d2f r38a8c4c  
    1515rm -rf build 
    1616 
    17 "$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.1 
     17"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.2 
    1818"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0 
    1919 
  • build_tools/jenkins_rhel6_build.sh

    r24a6d2f r38a8c4c  
    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.1 
     30"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.2 
    3131"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0 
    3232python deps.py 
  • build_tools/jenkins_win32_build.bat

    ra91bc5d r38a8c4c  
    1616RD /S /Q build 
    1717 
    18 rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.1 
    19 rem %PYTHON% -m pip install -t ../sansview-install --no-deps numdifftools=0.6.0 
     18rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.2 
    2019rem PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0 
    2120rem %PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5 
  • check_packages.py

    r24a6d2f r38a8c4c  
    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.1','import_name':'bumps','test':'__version__'}, 
     16    'bumps':{'version':'0.7.5.2','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__'}, 
     
    2020    'matplotlib':{'version':'1.1.0','import_name':'matplotlib','test':'__version__'}, 
    2121    'pisa':{'version':'3.0.28','import_name':'ho.pisa','test':'__version__'}, 
    22     'numdifftools':{'version':'0.6.0','import_name':'numdifftools','test':None}, 
    2322} 
    2423win_required_package_list = { 
  • sansview/setup_exe.py

    ra91bc5d r38a8c4c  
    308308packages = [ 
    309309    'matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 
    310     'win32com', 'ho.pisa', 'bumps', 'numdifftools', 
     310    'win32com', 'ho.pisa', 'bumps', 
    311311    ] 
    312312packages.extend([ 
  • setup.py

    r24a6d2f r38a8c4c  
    348348 
    349349required = [ 
    350     'bumps>=0.7.5.1', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 
     350    'bumps>=0.7.5.2', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 
    351351 
    352352    # 'lxml>=2.2.2', 
    353353    'lxml',  
    354  
    355     ## numdifftools is an optional dependency for bumps, giving better 
    356     ## errorbars for amoeba and differential evolution.  It is suppressed 
    357     ## because it forces scipy>=0.8, which the SNS does not yet support. 
    358     # 'numdifftools', 
    359354 
    360355    ## The following dependecies won't install automatically, so assume them 
Note: See TracChangeset for help on using the changeset viewer.