Changeset aff7904 in sasview for build_tools


Ignore:
Timestamp:
Apr 28, 2016 7:38:05 AM (8 years ago)
Author:
wojciech
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:
3371d81
Parents:
5881b17 (diff), 259aaa0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Conflicts fixed, merged with master

Location:
build_tools
Files:
8 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_osx_build.sh

    r5881b17 raff7904  
    5555cd sasview 
    5656$PYTHON setup.py clean 
    57 $PYTHON setup.py build 
    58 #$PYTHON setup.py docs 
     57$PYTHON setup.py build docs bdist_egg 
    5958 
    6059 
    61 # SASVIEW BUILD_egg with new docs 
     60# INSTALL SASVIEW 
    6261cd $WORKSPACE 
    6362cd sasview 
    64 $PYTHON setup.py docs bdist_egg 
    6563cd dist 
    6664$EASY_INSTALL -d $WORKSPACE/sasview/sasview-install sasview*.egg 
     65 
    6766 
    6867# TEST 
    … …  
    7271#$PYTHON utest_sasview.py 
    7372 
    74 ## PYLINT 
    75 #cd $WORKSPACE 
    76 #cd sasview 
    77 #$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee  test/sasview.txt 
    78  
     73# PYLINT 
     74cd $WORKSPACE 
     75cd sasview 
     76$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee  test/sasview.txt 
    7977 
    8078# BUILD APP 
    81 #cd $WORKSPACE 
    82 #cd sasview/sasview 
    83 #$PYTHON setup_mac.py py2app 
     79cd $WORKSPACE 
     80cd sasview/sasview 
     81$PYTHON setup_mac.py py2app 
    8482 

  • 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 
Note: See TracChangeset for help on using the changeset viewer.