Changeset b2921d0 in sasmodels

Timestamp:

Apr 7, 2017 6:17:32 PM (8 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 18:17:32)

git-committer:

GitHub <noreply@…> (04/07/17 18:17:32)

Message:

Merge pull request #38 from andyfaff/trav_conda

ENH: travis on py3 and osx

File:

• .travis.yml (modified) (1 diff)

.travis.yml

@@ -1 +1 @@
 language: python
-python:
-- '2.7'
+
+sudo:  false
+
+matrix:
+  include:
+    - os: linux
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+    - os: linux
+      env:
+        - PY=3
+        - NUMPYSPEC=numpy
+    - os: osx
+      language: generic
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+    - os: osx
+      language: generic
+      env:
+        - PY=3
+        - NUMPYSPEC=numpy
+
+# whitelist
 branches:
   only:
-  - master
-virtualenv:
-  system_site_packages: true
+    - master
+
+addons:
+  apt:
+    packages:
+      opencl-headers
+
 before_install:
-- sudo apt-get update;
-- sudo apt-get install python-numpy python-scipy
+  - 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;
+    fi;
+  - if [[ "$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
+
+  # Useful for debugging any issues with conda
+  - conda info -a
+
+  - conda install --yes python=$PY $NUMPYSPEC scipy cython mako cffi
+
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      pip install pyopencl;
+    fi;
+
 install:
-- pip install bumps
-- pip install unittest-xml-reporting
+  - pip install bumps
+  - pip install unittest-xml-reporting
+
 script:
 - export WORKSPACE=/home/travis/build/SasView/sasmodels/
 - python -m sasmodels.model_test dll all
+
 notifications:
   slack: