Changeset 02ba2df 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:

83cd257

Parents:

8374dc0

git-author:

Andrew Nelson <andyfaff@…> (03/25/17 21:17:20)

git-committer:

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

Message:

ENH: travis - test on OSX as well

File:

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

.travis.yml

@@ -3 +3 @@
 language: python
 
-# can eventually include OSX here.
 matrix:
     include:
         - os: linux
-          env: PY=2.7
+          env:
+            - PY=2.7
+            - NUMPYSPEC=numpy
+        - os: osx
+          language: generic
+          env:
+            - PY=2.7
+            - NUMPYSPEC=numpy
 
 # whitelist
@@ -30 +36 @@
     - 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
+
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
@@ -41 +56 @@
     # could install other dependencies, but they're locked to specific
     # versions in build/requirements.txt
-    - conda install --yes python=$PY numpy scipy cython pylint wxpython
-    - sudo apt-get update; sudo apt-get install python-pyopencl
+    - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
 
 install:
@@ -48 +62 @@
   - pip install matplotlib
 
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-  
+
 script:
   - cd ..