Changeset 243fbc0 in sasview


Ignore:
Timestamp:
Apr 22, 2016 4:27:10 PM (9 years ago)
Author:
Paul Kienzle <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:
a7c4ad2
Parents:
05228b0
Message:

move bumps version to 0.7.5.9

Files:
11 edited

Legend:

Unmodified
Added
Removed

  • build_tools/conda/bumps/meta.yaml

    rb75079b r243fbc0  
    11package: 
    22  name: bumps 
    3   version: !!str 0.7.5.4 
     3  version: !!str 0.7.5.9 
    44 
    55source: 
    6   fn: bumps-0.7.5.4.tar.gz 
    7   url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.4.tar.gz 
     6  fn: bumps-0.7.5.9.tar.gz 
     7  url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.9.tar.gz 
    88  md5: a47c035fbb18afa5ca53067506a5ff1c 
    99#  patches: 

  • build_tools/jenkins_linux_build.sh

    r9d5427f r243fbc0  
    1515rm -rf build 
    1616 
    17 "$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.6 
     17"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.9 
    1818"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0 
    1919 

  • build_tools/jenkins_linux_build_ver02.sh

    r22c1f1c r243fbc0  
    2727 
    2828 
    29 "$EASY_INSTALL" -d "$WORKSPACE/sasview/utils" bumps==0.7.5.6 
     29"$EASY_INSTALL" -d "$WORKSPACE/sasview/utils" bumps==0.7.5.9 
    3030"$EASY_INSTALL" -d "$WORKSPACE/sasview/utils" periodictable==1.3.0 
    3131 

  • build_tools/jenkins_rhel6_build.sh

    r9d5427f r243fbc0  
    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.6 
     30"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.9 
    3131"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0 
    3232python deps.py 

  • build_tools/jenkins_win32_build.bat

    r9d5427f r243fbc0  
    1616RD /S /Q build 
    1717 
    18 rem %PYTHON% -m pip install -t ../sasview-install --no-deps bumps=0.7.5.6 
     18rem %PYTHON% -m pip install -t ../sasview-install --no-deps bumps=0.7.5.9 
    1919rem PYTHON% -m pip install -t ../sasview-install --no-deps periodictable=1.3.0 
    2020rem %PYTHON% -m pip install -t ../sasview-install --no-deps pyparsing=1.5.5 

  • build_tools/jenkins_win32_py27_build.bat

    r9d5427f r243fbc0  
    1616RD /S /Q build 
    1717 
    18 rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.6 
     18rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.9 
    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 

  • build_tools/requirements.txt

    ra985c93 r243fbc0  
    99PIL==1.1.7 
    1010periodictable==1.3.0 
    11 bumps==0.7.5.5 
     11bumps==0.7.5.9 
    1212# numpy==1.6.1 
    1313# scipy==0.10.1 

  • check_packages.py

    r4188da8 r243fbc0  
    1919    'pylint':{'version':None,'import_name':'pylint','test':None}, 
    2020    'periodictable':{'version':'1.3.0','import_name':'periodictable','test':'__version__'}, 
    21     'bumps':{'version':'0.7.5.8','import_name':'bumps','test':'__version__'}, 
     21    'bumps':{'version':'0.7.5.9','import_name':'bumps','test':'__version__'}, 
    2222    'numpy':{'version':'1.6.1','import_name':'numpy','test':'__version__'}, 
    2323    'scipy':{'version':'0.10.1','import_name':'scipy','test':'__version__'}, 

  • sasview/README.txt

    rfa4ea80 r243fbc0  
    343343            - unittest-xml-reporting 1.12.0 (MAC 1.10.0) 
    344344            - matplotlib Version Installed: 1.4.3 (MAC 1.1.1) 
    345             - bumps Version Installed: 0.7.5.6 
     345            - bumps Version Installed: 0.7.5.9 
    346346            - scipy Version Installed: 0.16.0b2 (MAC 0.11.0) 
    347347            - periodictable Version Installed: 1.4.1 

  • setup.py

    rc8843be r243fbc0  
    309309 
    310310required = [ 
    311     'bumps>=0.7.5.6', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 
     311    'bumps>=0.7.5.9', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 
    312312 
    313313    # 'lxml>=2.2.2', 

  • src/sas/sasgui/perspectives/fitting/fitting.py

    r05228b0 r243fbc0  
    6161    from bumps.gui.fit_dialog import EVT_FITTER_CHANGED 
    6262except ImportError: 
     63    # CRUFT: bumps 0.7.5.8 and below 
    6364    EVT_FITTER_CHANGED = None  # type: wx.PyCommandEvent 
    6465 
    … …  
    507508        self.parent.Bind(EVT_SLICER_PARS_UPDATE, self._onEVT_SLICER_PANEL) 
    508509 
     510        # CRUFT: EVT_FITTER_CHANGED is not None for bumps 0.7.5.9 and above 
    509511        if EVT_FITTER_CHANGED is not None: 
    510512            self.parent.Bind(EVT_FITTER_CHANGED, self.on_fitter_changed) 
Note: See TracChangeset for help on using the changeset viewer.