Changeset 83cd257 in sasview

Timestamp:

Apr 4, 2017 4: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:

4636f57

Parents:

02ba2df

git-author:

Andrew Nelson <andyfaff@…> (03/26/17 06:18:25)

git-committer:

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

Message:

wrangling travis

File:

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

.travis.yml

@@ -4 +4 @@
 
 matrix:
-    include:
-        - os: linux
-          env:
-            - PY=2.7
-            - NUMPYSPEC=numpy
-        - os: osx
-          language: generic
-          env:
-            - PY=2.7
-            - NUMPYSPEC=numpy
+  include:
+    - os: linux
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+    - os: osx
+      language: generic
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
 
 # whitelist
@@ -21 +21 @@
 
 addons:
-    apt:
-        packages:
-            - opencl-headers
-            - fglrx
-            - libblas-dev
-            - libatlas-dev
-            - libatlas-base-dev
-            - liblapack-dev
-            - gfortran
-            - libhdf5-serial-dev
+  apt:
+    packages:
+      - opencl-headers
+      - fglrx
+      - libblas-dev
+      - libatlas-dev
+      - libatlas-base-dev
+      - liblapack-dev
+      - gfortran
+      - libhdf5-serial-dev
 
 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
-    - 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
+  - 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
+  - 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
+  # 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
+  # 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
 
 install:
@@ -62 +57 @@
   - 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
 
 script: