Changeset 2114e8b in sasview


Ignore:
Timestamp:
Apr 4, 2017 4:12:57 PM (2 years ago)
Author:
andyfaff
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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
fafff1a
Parents:
c2e9949
git-author:
Andrew Nelson <andyfaff@…> (03/21/17 01:07:18)
git-committer:
Andrew Nelson <andyfaff@…> (04/04/17 16:12:57)
Message:

BLD: clone bumps so that doc doesn't complain

File:
1 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    rc2e9949 r2114e8b  
    4141    # could install other dependencies, but they're locked to specific 
    4242    # versions in build/requirements.txt 
    43     - conda install --yes python=$PY numpy scipy cython pylint 
     43    - conda install --yes python=$PY numpy scipy cython pylint wxpython 
    4444    - sudo apt-get update; sudo apt-get install python-pyopencl python-matplotlib 
    4545     
     
    5858  # clone the sasmodels 
    5959  - export WORKSPACE=$(pwd) 
    60   #- export WORKSPACE=/home/travis/build/SasView/ 
    61   #- cd $WORKSPACE 
    6260  - git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels 
    63   #- export PYTHONPATH=$WORKSPACE/sasview/sasview-install:$WORKSPACE/sasview/utils:$PYTHONPATH 
    64   - cd $WORKSPACE 
     61 
     62  # required for documentation 
     63  - git clone --depth=50 --branch=master https://github.com/bumps/bumps.git 
     64 
    6565  - ls -ltr 
    6666  - if [ ! -d "utils" ]; then mkdir utils; fi 
    6767  - /bin/sh -xe sasview/build_tools/travis_build.sh 
    68 #  - /bin/sh -xe sasview/build_tools/jenkins_linux_test.sh 
    6968  - export LC_ALL=en_US.UTF-8 
    7069  - export LANG=en_US.UTF-8 
Note: See TracChangeset for help on using the changeset viewer.