diff --git a/.travis.yml b/.travis.yml index fc8d1de..b8d4240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: c sudo: false - +os: + - osx + - linux env: matrix: - CONDA_PY=3.4 @@ -18,8 +20,8 @@ addons: install: - source devtools/travis-ci/install_miniconda.sh +- conda config --add channels conda-forge - conda config --add channels omnia -- conda install -yq python-coveralls before_script: - | @@ -44,7 +46,7 @@ deploy: local-dir: docs/_deploy/ on: branch: master - condition: "$CONDA_PY = 3.5" + condition: "$CONDA_PY = 3.5 && $TRAVIS_OS_NAME = 'linux'" region: us-east-1 detect_encoding: true access_key_id: $AWS_ACCESS_KEY diff --git a/README.md b/README.md index 6d493a5..4fb2eb3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ MSMExplorer: data visualizations for biomolecular dynamics [![Build Status](https://travis-ci.org/msmexplorer/msmexplorer.svg?branch=master)](https://travis-ci.org/msmexplorer/msmexplorer) [![Build status](https://ci.appveyor.com/api/projects/status/038hirce0vlx2847?svg=true)](https://ci.appveyor.com/project/cxhernandez/msmexplorer) -[![Coverage Status](https://coveralls.io/repos/github/msmexplorer/msmexplorer/badge.svg?branch=master)](https://coveralls.io/github/msmexplorer/msmexplorer?branch=master) [![PyPI version](https://badge.fury.io/py/msmexplorer.svg)](http://badge.fury.io/py/msmexplorer) [![License](https://img.shields.io/badge/license-MIT-red.svg?style=flat)](https://opensource.org/licenses/MIT) [![DOI](http://joss.theoj.org/papers/f9485c45a7bfc5cfce6edd8919a07739/status.svg)](http://joss.theoj.org/papers/f9485c45a7bfc5cfce6edd8919a07739) diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index 5db0f61..514d836 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -31,7 +31,6 @@ test: requires: - nose - nose-timer - - python-coveralls imports: - msmexplorer diff --git a/devtools/travis-ci/install_miniconda.sh b/devtools/travis-ci/install_miniconda.sh index 0aae1bf..dc76192 100755 --- a/devtools/travis-ci/install_miniconda.sh +++ b/devtools/travis-ci/install_miniconda.sh @@ -1,11 +1,23 @@ #!/bin/bash -MINICONDA=Miniconda3-latest-Linux-x86_64.sh + +if [[ $TRAVIS_OS_NAME = 'osx' ]]; then + MINICONDA=Miniconda3-latest-MacOSX-x86_64.sh +else + MINICONDA=Miniconda3-latest-Linux-x86_64.sh +fi + MINICONDA_MD5=$(curl -s https://repo.continuum.io/miniconda/ | grep -A3 $MINICONDA | sed -n '4p' | sed -n 's/ *\(.*\)<\/td> */\1/p') wget https://repo.continuum.io/miniconda/$MINICONDA + +if [[ $TRAVIS_OS_NAME = 'osx' ]]; then + alias md5sum='md5 -r' +fi + if [[ $MINICONDA_MD5 != $(md5sum $MINICONDA | cut -d ' ' -f 1) ]]; then echo "Miniconda MD5 mismatch" exit 1 fi + bash $MINICONDA -b rm -f $MINICONDA