Changeset 2114e8b in sasview

Timestamp:

Apr 4, 2017 2:12:57 PM (8 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/20/17 23:07:18)

git-committer:

Andrew Nelson <andyfaff@…> (04/04/17 14:12:57)

Message:

BLD: clone bumps so that doc doesn't complain

File:

• .travis.yml (modified) (2 diffs)

.travis.yml

@@ -41 +41 @@
     # could install other dependencies, but they're locked to specific
     # versions in build/requirements.txt
-    - conda install --yes python=$PY numpy scipy cython pylint
+    - conda install --yes python=$PY numpy scipy cython pylint wxpython
     - sudo apt-get update; sudo apt-get install python-pyopencl python-matplotlib
     
@@ -58 +58 @@
   # clone the sasmodels
   - export WORKSPACE=$(pwd)
-  #- export WORKSPACE=/home/travis/build/SasView/
-  #- cd $WORKSPACE
   - git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels
-  #- export PYTHONPATH=$WORKSPACE/sasview/sasview-install:$WORKSPACE/sasview/utils:$PYTHONPATH
-  - cd $WORKSPACE
+
+  # required for documentation
+  - git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
+
   - ls -ltr
   - if [ ! -d "utils" ]; then mkdir utils; fi
   - /bin/sh -xe sasview/build_tools/travis_build.sh
-#  - /bin/sh -xe sasview/build_tools/jenkins_linux_test.sh
   - export LC_ALL=en_US.UTF-8
   - export LANG=en_US.UTF-8