Changeset c10d5c63 in sasview

Timestamp:

Apr 4, 2017 2:12:57 PM (7 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:

c2e9949

Parents:

4b81e01

git-author:

Andrew Nelson <andyfaff@…> (03/20/17 22:07:06)

git-committer:

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

Message:

BLD: trying to get travis to work

Files:

• .travis.yml (modified) (2 diffs)
• build_tools/travis_build.sh (modified) (1 diff)

.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 matplotlib cython pylint
+    - conda install --yes python=$PY numpy scipy matplotlib cython pylint pyparsing=1.5.5
     - sudo apt-get update; sudo apt-get install python-pyopencl
     
@@ -54 +54 @@
   
 script:
-  - export WORKSPACE=/home/travis/build/SasView/
-  - cd $WORKSPACE
+  - cd ..
+  # this should be the directory above the sasview directory, where we want to
+  # 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-install:$WORKSPACE/utils:$PYTHONPATH
+  #- export PYTHONPATH=$WORKSPACE/sasview/sasview-install:$WORKSPACE/sasview/utils:$PYTHONPATH
   - cd $WORKSPACE
   - ls -ltr

build_tools/travis_build.sh

@@ -1 @@
-# Simplified build for Travic CI
+# Simplified build for Travis CI
 # No documentation is built
 export PATH=$PATH:/usr/local/bin/