Changeset b2921d0 in sasmodels


Ignore:
Timestamp:
Apr 7, 2017 4:17:32 PM (7 years ago)
Author:
GitHub <noreply@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
bf8c271, e4e5e29, 3a45c2c, 587cbcd
Parents:
3330bb4 (diff), 24cd982 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Paul Kienzle <pkienzle@…> (04/07/17 16:17:32)
git-committer:
GitHub <noreply@…> (04/07/17 16:17:32)
Message:

Merge pull request #38 from andyfaff/trav_conda

ENH: travis on py3 and osx

File:
1 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    r01e551a r24cd982  
    11language: python 
    2 python: 
    3 - '2.7' 
     2 
     3sudo:  false 
     4 
     5matrix: 
     6  include: 
     7    - os: linux 
     8      env: 
     9        - PY=2.7 
     10        - NUMPYSPEC=numpy 
     11    - os: linux 
     12      env: 
     13        - PY=3 
     14        - NUMPYSPEC=numpy 
     15    - os: osx 
     16      language: generic 
     17      env: 
     18        - PY=2.7 
     19        - NUMPYSPEC=numpy 
     20    - os: osx 
     21      language: generic 
     22      env: 
     23        - PY=3 
     24        - NUMPYSPEC=numpy 
     25 
     26# whitelist 
    427branches: 
    528  only: 
    6   - master 
    7 virtualenv: 
    8   system_site_packages: true 
     29    - master 
     30 
     31addons: 
     32  apt: 
     33    packages: 
     34      opencl-headers 
     35 
    936before_install: 
    10 - sudo apt-get update; 
    11 - sudo apt-get install python-numpy python-scipy 
     37  - echo $TRAVIS_OS_NAME 
     38 
     39  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
     40      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; 
     41    fi; 
     42  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
     43      wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh; 
     44    fi; 
     45 
     46  - bash miniconda.sh -b -p $HOME/miniconda 
     47  - export PATH="$HOME/miniconda/bin:$PATH" 
     48  - hash -r 
     49  - conda update --yes conda 
     50 
     51  # Useful for debugging any issues with conda 
     52  - conda info -a 
     53 
     54  - conda install --yes python=$PY $NUMPYSPEC scipy cython mako cffi 
     55 
     56  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
     57      pip install pyopencl; 
     58    fi; 
     59 
    1260install: 
    13 - pip install bumps 
    14 - pip install unittest-xml-reporting 
     61  - pip install bumps 
     62  - pip install unittest-xml-reporting 
     63 
    1564script: 
    1665- export WORKSPACE=/home/travis/build/SasView/sasmodels/ 
    1766- python -m sasmodels.model_test dll all 
     67 
    1868notifications: 
    1969  slack: 
Note: See TracChangeset for help on using the changeset viewer.