Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OS X Support #39

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: c
sudo: false

os:
- osx
- linux
env:
matrix:
- CONDA_PY=3.4
Expand All @@ -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:
- |
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion devtools/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ test:
requires:
- nose
- nose-timer
- python-coveralls

imports:
- msmexplorer
Expand Down
14 changes: 13 additions & 1 deletion devtools/travis-ci/install_miniconda.sh
Original file line number Diff line number Diff line change
@@ -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>\(.*\)<\/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

Expand Down