Merge dcd480c into 8490fb8

.travis.yml

@@ -44,14 +44,16 @@ install:
         echo "Associated pull request found - PR $TRAVIS_PULL_REQUEST";
       fi
     fi
-  - REF_DATA_BRANCH=${TRAVIS_PULL_REQUEST//false/reference_data}
-  - git clone https://github.com/ioam/holoviews-data.git -b reference_data ./doc/reference_data
-  - cd ./doc/reference_data
-  - echo "Attempting to checkout $REF_DATA_BRANCH branch"
-  - if [ $(git branch -a --list *origin/$REF_DATA_BRANCH | wc -l) -eq 1 ] ; then
-      git checkout origin/$REF_DATA_BRANCH;
-    else
-      echo "Using the master branch reference data";
+  - if [ "$TRAVIS_BRANCH" == 'master' ]; then
+      REF_DATA_BRANCH=${TRAVIS_PULL_REQUEST//false/reference_data};
+      git clone https://github.com/ioam/holoviews-data.git -b reference_data ./doc/reference_data;
+      cd ./doc/reference_data;
+      echo "Attempting to checkout $REF_DATA_BRANCH branch";
+      if [ $(git branch -a --list *origin/$REF_DATA_BRANCH | wc -l) -eq 1 ] ; then
+        git checkout origin/$REF_DATA_BRANCH;
+      else
+        echo "Using the master branch reference data";
+      fi
     fi
   - cd ../..
 
@@ -63,10 +65,17 @@ script:
   - echo 'import holoviews as hv;hv.config(style_17=True);hv.config.warn_options_call=True' > holoviews.rc
   - flake8 --ignore=E,W,F999,F405 holoviews
   - nosetests --with-doctest --with-coverage --cover-package=holoviews
-  - cd doc/nbpublisher; chmod +x test_notebooks.py; QT_QPA_PLATFORM='offscreen' BOKEH_DEV=True ./test_notebooks.py
-  - chmod +x concat_html.py; ./concat_html.py ../test_data ../test_html
-  - cd ../../; mv doc/Tutorials/.coverage ./.coverage.notebooks
-  - coverage combine --append
+  - if [ "$TRAVIS_BRANCH" == 'master' ]; then
+      cd doc/nbpublisher;
+      chmod +x test_notebooks.py;
+      QT_QPA_PLATFORM='offscreen' BOKEH_DEV=True ./test_notebooks.py;
+      chmod +x concat_html.py;
+      ./concat_html.py ../test_data ../test_html;
+      cd ../../; mv doc/Tutorials/.coverage ./.coverage.notebooks;
+      coverage combine --append;
+    else
+      pytest examples --nbsmoke-run -k ".ipynb" --cov=holoviews --cov-append;
+    fi
 
 after_script:
   - shopt -s expand_aliases

environment.yml

@@ -24,4 +24,6 @@ dependencies:
   # Testing requirements
   - flake8
   - nose
-  - pytest
+  - pytest-cov
+  - nbsmoke
+