Improved build matrix

Author: ocefpaf

.travis.yml

@@ -6,19 +6,20 @@ matrix:
   fast_finish: true
   include:
   - python: 2.7
-    env: TEST_TARGET=release
+    env: TEST_TARGET=branca_release
   - python: 3.5
-    env: TEST_TARGET=release
+    env: TEST_TARGET=branca_release
   - python: 3.5
     env: TEST_TARGET=coding_standards
   - python: 3.5
     env: TEST_TARGET=notebooks
-  allow_failures:
   - python: 2.7
     env: TEST_TARGET=branca_latest
   - python: 3.5
     env: TEST_TARGET=branca_latest
-
+  allow_failures:
+  - python: 3.5
+    env: TEST_TARGET=branca_latest
 
 before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
@@ -38,8 +39,8 @@ install:
     - python setup.py sdist && version=$(python setup.py --version) && pushd dist  && pip install folium-${version}.tar.gz && popd
 
 script:
-    - if [[ 'release' == *"$TEST_TARGET"* ]]; then
-        python setup.py test ;
+    - if [[ $TEST_TARGET == 'branca_release' ]]; then
+        py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
       fi
 
     - if [[ $TEST_TARGET == 'branca_latest' ]]; then
@@ -50,3 +51,7 @@ script:
     - if [[ $TEST_TARGET == 'coding_standards' ]]; then
         find . -type f -name "*.py" ! -name 'conf.py' | xargs flake8 --max-line-length=100 ;
       fi
+
+    - if [[ $TEST_TARGET == 'notebooks' ]]; then
+        py.test -vv tests/notebooks/test_notebooks.py ;
+      fi

tests/test_notebooks.py tests/notebooks/test_notebooks.pytests/test_notebooks.py renamed to tests/notebooks/test_notebooks.py

@@ -32,7 +32,7 @@ def __call__(self, exporter=None, filename=None):
                 open(filename, 'w').write(out_nb[0].encode('utf-8'))
 
     class TestNotebooks(object):
-        _filepath = rootpath.rstrip('/')+'/../examples/'
+        _filepath = rootpath.rstrip('/') + '/../../examples/'
         _nblist = [x for x in os.listdir(_filepath) if x.endswith('.ipynb')]
 
     for fn in TestNotebooks._nblist: