From ca42f17755df7eba79760aa8a0944b92d247df3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Fri, 9 Sep 2016 09:19:08 -0700 Subject: [PATCH 01/10] Update .travis.yml add osx --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1be6eb6..b4866fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: c sudo: false +os: + - osx + - linux env: matrix: - CONDA_PY=3.4 From 8f9022d2c18f86458797245fccd3f8ca7a4d4f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 11:39:23 -0700 Subject: [PATCH 02/10] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e216cfd..08b7072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,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 From 40202608fcbbdf91b7d75164e2bdb27dfbf71a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 12:48:06 -0700 Subject: [PATCH 03/10] Update install_miniconda.sh --- devtools/travis-ci/install_miniconda.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/devtools/travis-ci/install_miniconda.sh b/devtools/travis-ci/install_miniconda.sh index 0aae1bf..ae06420 100755 --- a/devtools/travis-ci/install_miniconda.sh +++ b/devtools/travis-ci/install_miniconda.sh @@ -2,10 +2,16 @@ MINICONDA=Miniconda3-latest-Linux-x86_64.sh 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 From fb82a80b6aa19f13e039c9a82337bfcbe57db8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 13:07:00 -0700 Subject: [PATCH 04/10] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08b7072..5ec41f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ addons: install: - source devtools/travis-ci/install_miniconda.sh - conda config --add channels omnia -- conda install -yq python-coveralls before_script: - | From f6a92a45b541e5078a600e9967c2073b51f36a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 13:07:29 -0700 Subject: [PATCH 05/10] Update meta.yaml --- devtools/conda-recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) 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 From 0535fc955ce2ad05bd36ae3b70acf57d3569034b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 13:08:05 -0700 Subject: [PATCH 06/10] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) 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) From 81716332f214b44d03facfa700beeb2e2f736841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 13:17:49 -0700 Subject: [PATCH 07/10] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ec41f3..bdb5a71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons: install: - source devtools/travis-ci/install_miniconda.sh -- conda config --add channels omnia +- conda config --add channels conda-forge before_script: - | From e4cbccb687e79faaed0ac0ece9a812b18b2265df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 13:26:02 -0700 Subject: [PATCH 08/10] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bdb5a71..b8d4240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ addons: install: - source devtools/travis-ci/install_miniconda.sh - conda config --add channels conda-forge +- conda config --add channels omnia before_script: - | From 9302c89272431ccf534cabff57f5cc7f659476b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 13:45:50 -0700 Subject: [PATCH 09/10] Update install_miniconda.sh --- devtools/travis-ci/install_miniconda.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/devtools/travis-ci/install_miniconda.sh b/devtools/travis-ci/install_miniconda.sh index ae06420..8863c4c 100755 --- a/devtools/travis-ci/install_miniconda.sh +++ b/devtools/travis-ci/install_miniconda.sh @@ -1,5 +1,11 @@ #!/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 +if + 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 From 7178a31a94a30cf87d4ef46ffc13ec13e3df29d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hern=C3=A1ndez?= Date: Thu, 3 Aug 2017 13:54:39 -0700 Subject: [PATCH 10/10] Update install_miniconda.sh --- devtools/travis-ci/install_miniconda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/travis-ci/install_miniconda.sh b/devtools/travis-ci/install_miniconda.sh index 8863c4c..dc76192 100755 --- a/devtools/travis-ci/install_miniconda.sh +++ b/devtools/travis-ci/install_miniconda.sh @@ -4,7 +4,7 @@ if [[ $TRAVIS_OS_NAME = 'osx' ]]; then MINICONDA=Miniconda3-latest-MacOSX-x86_64.sh else MINICONDA=Miniconda3-latest-Linux-x86_64.sh -if +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