Merge pull request #7 from jhprinz/tv

Update Travis and Conda related things

.travis.yml

@@ -1,34 +1,17 @@
-language: python
-
-python:
-  # We don't actually use the Travis Python, but this keeps it organized.
-  - "2.7"
+language: c
+sudo: false
 
 install:
-  - deactivate
-  # Sets up a MINIConda enviroment in the name of the selected python version
-  - source devtools/ci/install.sh
-  # Do not buffer output of python outputs but flush them directly to the terminal
-  - export PYTHONUNBUFFERED=true
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi
+  - source devtools/travis-ci/install_miniconda.sh
 
 script:
-    # testing is done by running run_test.sh automatically during build
   - echo travis_fold:start:conda.build.package
-  - conda install --yes conda-build
   - conda build devtools/conda-recipe
   - echo travis_fold:end:conda.build.package
 
-  # Upload new docs
-  - bash -x devtools/ci/after_sucess.sh
-
 env:
-  matrix:
-    - python=2.7  CONDA_PY=27  CONDA_NPY=110
-    - python=3.4  CONDA_PY=34  CONDA_NPY=110
-    - python=3.5  CONDA_PY=35  CONDA_NPY=110
-
-  global:
-  - secure: "NJvoSrLNd2ZR3HluJjEqI36gD5lsucwIvgnYjNmM4cwnnA77aLV9FRYTwlLRZn3XY9FL8KOzL5l0amNzMD7sQrf7bWwWv7iCUBddH549q9RSgiuOugtodYJ6VaXi76hk1rOgcJpDoCj9wTCIlMtWibPUzr1QHmdihfdM2iA2kkE="
-  - secure: "l9NJkZDD0ALhkErUvhRrreLsrcWErd+CXpWv8dxHGtkjemNx6CwVtyL+a30jz/QwMANSZbKll/cPK5yJQvuwDaWxja6UPLLKVNGtma+CmwKcIC/wwTwbMoxcS62fyLJ3kS0qR8oCQz2nCPKiYyRGADtPLWVMZckY1SJfNYcKuCM="
-
-  - secure: kb37xmsSV3pEnESnINzwlW2Cju/UFzA/G+m+NsihAwO8RMPZwKCrZK/rptgkUDACXJxom5M690WEukQkHnOt+OTrWhu7WKZgYeVuWUs2++RohYv/m5npaOHMMn+uYmF328v4PvPmXxbD02zzg5Tgdn82x8oa6J8BKX8ohOQ6Xpg=
+  - CONDA_PY=2.7 CONDA_NPY=1.7
+  - CONDA_PY=2.7 CONDA_NPY=1.11
+  - CONDA_PY=3.4 CONDA_NPY=1.10
+  - CONDA_PY=3.5 CONDA_NPY=1.11

devtools/ci/install.sh → devtools/travis-ci/install_miniconda.sh

@@ -6,21 +6,22 @@
 echo travis_fold:start:install.conda
 echo Install conda
 
-MINICONDA=Miniconda2-latest-Linux-x86_64.sh
+if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then MINICONDA=Miniconda3-latest-MacOSX-x86_64.sh; fi
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 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 [[ $MINICONDA_MD5 != $(md5sum $MINICONDA | cut -d ' ' -f 1) ]]; then
     echo "Miniconda MD5 mismatch"
-    echo "Expected: $MINICONDA_MD5"
-    echo "Found: $(md5sum $MINICONDA | cut -d ' ' -f 1)"
     exit 1
 fi
-bash $MINICONDA -b
 
-export PATH=$HOME/miniconda2/bin:$PATH
+bash $MINICONDA -b
+rm -f $MINICONDA
 
-# add omnia and update
-conda config --add channels http://conda.anaconda.org/omnia
-conda update --yes conda
+export PATH=$HOME/miniconda3/bin:$PATH
 
-echo travis_fold:end:install.conda
+conda update -yq conda
+conda install -yq conda-build jinja2