Changes in / [8390cf6:cb9feea8] in sasview

Files:

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

.travis.yml

@@ -2 +2 @@
 
 language: python
-
-matrix:
-  include:
-    - os: linux
-      env:
-        - PY=2.7
-        - NUMPYSPEC=numpy
-    - os: osx
-      language: generic
-      env:
-        - PY=2.7
-        - NUMPYSPEC=numpy
-
+python:
+  - "2.7"
 # whitelist
 branches:
   only:
     - master
-
-addons:
-  apt:
-    packages:
-      - opencl-headers
-      - fglrx
-      - libblas-dev
-      - libatlas-dev
-      - libatlas-base-dev
-      - liblapack-dev
-      - gfortran
-      - libhdf5-serial-dev
-
+# command to install dependencies
+virtualenv:
+  system_site_packages: true
 before_install:
-  - echo $TRAVIS_OS_NAME
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-        sudo apt-get update; sudo apt-get install python-pyopencl;
-    elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
-    fi
-
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda update --yes conda
-
-  # Useful for debugging any issues with conda
-  - conda info -a
-
-  # could install other dependencies, but they're locked to specific
-  # versions in build/requirements.txt
-  - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
+  - 'if [ $TRAVIS_PYTHON_VERSION == "2.7" ]; then sudo apt-get update;sudo apt-get install python-matplotlib libhdf5-serial-dev python-h5py fglrx opencl-headers python-pyopencl gfortran libblas-dev liblapack-dev libatlas-dev; fi'
 
 install:
   - pip install -r build_tools/requirements.txt
-  - pip install matplotlib
 
-#before_script:
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-#        "export DISPLAY=:99.0"; "sh -e /etc/init.d/xvfb start"; sleep 3; # give xvfb some time to start
-#    fi
-
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
+  
 script:
-  - 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
-
-  # required for documentation
-  - git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
-
+  - export PYTHONPATH=$WORKSPACE/sasview-install:$WORKSPACE/utils:$PYTHONPATH
+  - cd $WORKSPACE
   - 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

build_tools/travis_build.sh

@@ -1 @@
-# Simplified build for Travis CI
+# Simplified build for Travic CI
 # No documentation is built
 export PATH=$PATH:/usr/local/bin/
@@ -38 +38 @@
 cd $WORKSPACE/sasview
 $PYTHON setup.py clean
-# $PYTHON setup.py build docs bdist_egg
-$PYTHON setup.py bdist_egg
+$PYTHON setup.py build docs bdist_egg
 
 # INSTALL SASVIEW