Tidying up

.travis.yml

@@ -73,20 +73,21 @@ jobs:
           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
+        - pushd ./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
-        - cd ../..
+        - popd
         - export HOLOVIEWSRC=`pwd`'/holoviews.rc'
         - echo 'import holoviews as hv;hv.config(style_17=True);hv.config.warn_options_call=True' > holoviews.rc
       script:
         - doit test_all_recommended
-        - cd doc/nbpublisher; chmod +x test_notebooks.py; QT_QPA_PLATFORM='offscreen' BOKEH_DEV=True ./test_notebooks.py
-
+        - cd doc/nbpublisher
+        - chmod +x test_notebooks.py
+        - QT_QPA_PLATFORM='offscreen' BOKEH_DEV=True ./test_notebooks.py
       after_script:
         - chmod +x concat_html.py; ./concat_html.py ../test_data ../test_html
         - cd ../../; mv doc/Tutorials/.coverage ./.coverage.notebooks

tox.ini

@@ -16,26 +16,16 @@ deps = .[tests]
 passenv = TRAVIS TRAVIS_*
 commands = nosetests --with-doctest --with-coverage --cover-package=holoviews
 
-[_examples]
-description = Test that default examples run
-deps = .[recommended, tests]
-commands = pytest --nbsmoke-run -k ".ipynb"
-
 [_all_recommended]
 description = Run all recommended tests
 deps = .[recommended, tests]
 commands = {[_flakes]commands}
            {[_unit]commands}
-#           {[_examples]commands}
 
 [_pkg]
 commands = bokeh sampledata
 
 [testenv]
-# geoviews dependency cartopy and test dependency iris cannot be
-# installed by pip alone, so provide access to site-packages and do
-# not install deps with pip, but do install nose into virtualenv
-# otherwise conda/system nose may be found
 sitepackages = True
 install_command = pip install --no-deps {opts} nose {packages}
 
@@ -44,12 +34,10 @@ changedir = {envtmpdir}
 commands = examples-pkg: {[_pkg]commands}
            unit: {[_unit]commands}
            flakes: {[_flakes]commands}
-           examples: {[_examples]commands}
            all_recommended: {[_all_recommended]commands}
 
 deps = unit: {[_unit]deps}
        flakes: {[_flakes]deps}
-       examples: {[_examples]deps}
        all_recommended: {[_all_recommended]deps}
 
 [flake8]