build updates

.conda.yml

@@ -10,7 +10,7 @@ dependencies:
 - matplotlib=1.5.0=np110py35_0
 - mpc=1.0.3=0
 - mpfr=3.1.5=0
-- numpy=1.10.4=py35_2
+- numpy=1.11.3=py35_nomkl_0
 - pandas=0.18.1=np110py35_0
 - pip=9.0.1=py35_1
 - python=3.5.2=0

.travis.yml

@@ -1,54 +1,35 @@
 language: generic
+
+os:
+  - linux
+  - osx
+
 install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OS=MacOS; else export OS=Linux; fi
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-$OS-x86_64.sh -O miniconda.sh
   - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
+  - export PATH="$HOME/miniconda/bin:$PATH" VERSION=$(git describe --tags)
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
   - conda install conda-build anaconda-client constructor
+  - conda/template.py conda/meta.tpl $VERSION > conda/meta.yaml 
   - conda build -c terhorst -c conda-forge -c bioconda conda
-  - export VERSION=$(git describe --tags)
   - conda/template.py conda/constructor.tpl $VERSION > conda/construct.yaml 
-  - conda/template.py conda/meta.tpl $VERSION > conda/meta.yaml 
 
-matrix:
-  include:
-  - before_install:
-    - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-  - os: linux
-    deploy:
-      - provider: script
-        script: conda/deploy.sh
-        on:
-          repo: terhorst/psmcpp
-          tags: true
-      - provider: releases
-        on:
-          repo: terhorst/psmcpp
-          tags: true
-        api_key:
-          secure: VCht3BdnhgAdjYTyJqrHk5ZWNj/6WaajxjO0nCuSJZC43XCval+3c1I7Bckfs/YD+HAALVd9bMhVSi8VonpT6gvKyFGo5ttCFAGmJXz5+dCsBvbczblHcd9qV55T3K8HCsOrsjvGDrm3pRv9TPu2eBecPl8Y9uK1auEs/JJ0ywUnFA6plzAdtybc0FqywS0RZfm9W30vQVRCbkVQgP1nN0H8X1WeOC+fIckSHv0ejJ7NkoGhhX+J7/1FLe2EpmhAV2sLja2nneIko9xIT+hv27GmJ+xfj09osRzdkrVmbaL3CLu/ToF/6lb3fxjxQ+J6tnhn87HCnulOnvrQzgmMayVnd6EZLLxGsgJq2CMkUXNkCgYbnMmOV800/VsssHgsVNDIGQ20UYCIG1PbxW+U0BHfu8Q2b8npSTyadhU0SfQ6uZNiKsKbX+sce1tLTLwtI+zNYKkcvv3ruP556bX5Rl94y/jNCt1KwVE1wriO6TqclLMHfbjaregPtH0gvV19mpRBcaFLkkq1CNMjGDwSIOpZk14+qlVcZTtykHIIBcbA+9mr80JZo9AR7C+XJYTgqRz94MA76UbxQZeqTQuEyt9fIthw/jdzTKlGVQJitkjFdlsLoSQk+zkLxlIEfLmy1iTCeT0NY34At7vM1qgkC9usCWrOPJ+z5X1DVAhcUV8=
-        file_glob: true
-        file: smcpp-*-Linux-x86_64.sh
-        skip_cleanup: true
-    language: generic
-    sudo: required
-  - os: osx
-    before_install:
-      - wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOS-x86_64.sh -O miniconda.sh
-    deploy:
-      - provider: script
-        script: conda/deploy.sh
-        on:
-          repo: terhorst/psmcpp
-          tags: true
-      - provider: releases
-        on:
-          repo: terhorst/psmcpp
-          tags: true
-        api_key:
-          secure: VCht3BdnhgAdjYTyJqrHk5ZWNj/6WaajxjO0nCuSJZC43XCval+3c1I7Bckfs/YD+HAALVd9bMhVSi8VonpT6gvKyFGo5ttCFAGmJXz5+dCsBvbczblHcd9qV55T3K8HCsOrsjvGDrm3pRv9TPu2eBecPl8Y9uK1auEs/JJ0ywUnFA6plzAdtybc0FqywS0RZfm9W30vQVRCbkVQgP1nN0H8X1WeOC+fIckSHv0ejJ7NkoGhhX+J7/1FLe2EpmhAV2sLja2nneIko9xIT+hv27GmJ+xfj09osRzdkrVmbaL3CLu/ToF/6lb3fxjxQ+J6tnhn87HCnulOnvrQzgmMayVnd6EZLLxGsgJq2CMkUXNkCgYbnMmOV800/VsssHgsVNDIGQ20UYCIG1PbxW+U0BHfu8Q2b8npSTyadhU0SfQ6uZNiKsKbX+sce1tLTLwtI+zNYKkcvv3ruP556bX5Rl94y/jNCt1KwVE1wriO6TqclLMHfbjaregPtH0gvV19mpRBcaFLkkq1CNMjGDwSIOpZk14+qlVcZTtykHIIBcbA+9mr80JZo9AR7C+XJYTgqRz94MA76UbxQZeqTQuEyt9fIthw/jdzTKlGVQJitkjFdlsLoSQk+zkLxlIEfLmy1iTCeT0NY34At7vM1qgkC9usCWrOPJ+z5X1DVAhcUV8=
-        file_glob: true
-        file: smcpp-*-MacOS-x86_64.sh
-        skip_cleanup: true
+deploy:
+  - provider: script
+    script: conda/deploy.sh
+    on:
+      repo: terhorst/psmcpp
+      tags: true
+  - provider: releases
+    on:
+      repo: terhorst/psmcpp
+      tags: true
+    api_key:
+      secure: VCht3BdnhgAdjYTyJqrHk5ZWNj/6WaajxjO0nCuSJZC43XCval+3c1I7Bckfs/YD+HAALVd9bMhVSi8VonpT6gvKyFGo5ttCFAGmJXz5+dCsBvbczblHcd9qV55T3K8HCsOrsjvGDrm3pRv9TPu2eBecPl8Y9uK1auEs/JJ0ywUnFA6plzAdtybc0FqywS0RZfm9W30vQVRCbkVQgP1nN0H8X1WeOC+fIckSHv0ejJ7NkoGhhX+J7/1FLe2EpmhAV2sLja2nneIko9xIT+hv27GmJ+xfj09osRzdkrVmbaL3CLu/ToF/6lb3fxjxQ+J6tnhn87HCnulOnvrQzgmMayVnd6EZLLxGsgJq2CMkUXNkCgYbnMmOV800/VsssHgsVNDIGQ20UYCIG1PbxW+U0BHfu8Q2b8npSTyadhU0SfQ6uZNiKsKbX+sce1tLTLwtI+zNYKkcvv3ruP556bX5Rl94y/jNCt1KwVE1wriO6TqclLMHfbjaregPtH0gvV19mpRBcaFLkkq1CNMjGDwSIOpZk14+qlVcZTtykHIIBcbA+9mr80JZo9AR7C+XJYTgqRz94MA76UbxQZeqTQuEyt9fIthw/jdzTKlGVQJitkjFdlsLoSQk+zkLxlIEfLmy1iTCeT0NY34At7vM1qgkC9usCWrOPJ+z5X1DVAhcUV8=
+    file_glob: true
+    file: smcpp-v*-*-x86_64.sh
+    skip_cleanup: true