Changeset 02ba2df in sasview


Ignore:
Timestamp:
Apr 4, 2017 4:12:57 PM (7 months ago)
Author:
andyfaff
Branches:
master, ESS_GUI, ESS_GUI_SasView245, costrafo411, py3, ticket-853-fit-gui-to-calc, ticket-869, ticket-887-reorg, ticket-915, ticket-933, ticket-947-sasmodels-docs, ticket-976, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    rfafff1a r02ba2df  
    33language: python 
    44 
    5 # can eventually include OSX here. 
    65matrix: 
    76    include: 
    87        - os: linux 
    9           env: PY=2.7 
     8          env: 
     9            - PY=2.7 
     10            - NUMPYSPEC=numpy 
     11        - os: osx 
     12          language: generic 
     13          env: 
     14            - PY=2.7 
     15            - NUMPYSPEC=numpy 
    1016 
    1117# whitelist 
     
    3036    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
    3137          wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; 
     38          sudo apt-get update; sudo apt-get install python-pyopencl; 
     39      elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
     40          wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh; 
    3241      fi 
     42    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
     43        "export DISPLAY=:99.0"; 
     44        "sh -e /etc/init.d/xvfb start"; 
     45        sleep 3; # give xvfb some time to start 
     46      fi 
     47 
    3348    - bash miniconda.sh -b -p $HOME/miniconda 
    3449    - export PATH="$HOME/miniconda/bin:$PATH" 
     
    4156    # could install other dependencies, but they're locked to specific 
    4257    # versions in build/requirements.txt 
    43     - conda install --yes python=$PY numpy scipy cython pylint wxpython 
    44     - sudo apt-get update; sudo apt-get install python-pyopencl 
     58    - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython 
    4559 
    4660install: 
     
    4862  - pip install matplotlib 
    4963 
    50 before_script: 
    51   - "export DISPLAY=:99.0" 
    52   - "sh -e /etc/init.d/xvfb start" 
    53   - sleep 3 # give xvfb some time to start 
    54    
     64 
    5565script: 
    5666  - cd .. 
Note: See TracChangeset for help on using the changeset viewer.