Changeset 83cd257 in sasview


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

Legend:

Unmodified
Added
Removed
  • .travis.yml

    r02ba2df r83cd257  
    44 
    55matrix: 
    6     include: 
    7         - os: linux 
    8           env: 
    9             - PY=2.7 
    10             - NUMPYSPEC=numpy 
    11         - os: osx 
    12           language: generic 
    13           env: 
    14             - PY=2.7 
    15             - NUMPYSPEC=numpy 
     6  include: 
     7    - os: linux 
     8      env: 
     9        - PY=2.7 
     10        - NUMPYSPEC=numpy 
     11    - os: osx 
     12      language: generic 
     13      env: 
     14        - PY=2.7 
     15        - NUMPYSPEC=numpy 
    1616 
    1717# whitelist 
     
    2121 
    2222addons: 
    23     apt: 
    24         packages: 
    25             - opencl-headers 
    26             - fglrx 
    27             - libblas-dev 
    28             - libatlas-dev 
    29             - libatlas-base-dev 
    30             - liblapack-dev 
    31             - gfortran 
    32             - libhdf5-serial-dev 
     23  apt: 
     24    packages: 
     25      - opencl-headers 
     26      - fglrx 
     27      - libblas-dev 
     28      - libatlas-dev 
     29      - libatlas-base-dev 
     30      - liblapack-dev 
     31      - gfortran 
     32      - libhdf5-serial-dev 
    3333 
    3434before_install: 
    35     - echo $TRAVIS_OS_NAME 
    36     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
    37           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; 
    41       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 
     35  - echo $TRAVIS_OS_NAME 
     36  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
     37        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; 
     41    fi 
    4742 
    48     - bash miniconda.sh -b -p $HOME/miniconda 
    49     - export PATH="$HOME/miniconda/bin:$PATH" 
    50     - hash -r 
    51     - conda update --yes conda 
     43  - bash miniconda.sh -b -p $HOME/miniconda 
     44  - export PATH="$HOME/miniconda/bin:$PATH" 
     45  - hash -r 
     46  - conda update --yes conda 
    5247 
    53     # Useful for debugging any issues with conda 
    54     - conda info -a 
     48  # Useful for debugging any issues with conda 
     49  - conda info -a 
    5550 
    56     # could install other dependencies, but they're locked to specific 
    57     # versions in build/requirements.txt 
    58     - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython 
     51  # could install other dependencies, but they're locked to specific 
     52  # versions in build/requirements.txt 
     53  - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython 
    5954 
    6055install: 
     
    6257  - pip install matplotlib 
    6358 
     59before_script: 
     60  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
     61        "export DISPLAY=:99.0"; "sh -e /etc/init.d/xvfb start"; sleep 3; # give xvfb some time to start 
     62    fi 
    6463 
    6564script: 
Note: See TracChangeset for help on using the changeset viewer.