Merge pull request #503 from ocefpaf/fix_travis

Fix travis

Author: ocefpaf

.travis.yml

@@ -2,25 +2,15 @@ language: python
 
 sudo: false
 
-notifications:
-  email: false
-
-matrix:
-  fast_finish: true
-  include:
-    - python: 2.7
-      env: TEST_TARGET=branca_release
-    - python: 3.4
-      env: TEST_TARGET=branca_release
-    - python: 3.5
-      env: TEST_TARGET=branca_release
-  allow_failures:
-    - python: 3.5
-      env: TEST_TARGET=branca_latest
-    - python: 3.4
-      env: TEST_TARGET=branca_latest
-    - python: 2.7
-      env: TEST_TARGET=branca_latest
+python:
+    - 2.7
+    - 3.4
+    - 3.5
+
+env:
+    - TEST_TARGET=branca_release
+    - TEST_TARGET=branca_latest
+    - TEST_TARGET=coding_standards
 
 before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
@@ -35,14 +25,20 @@ before_install:
         conda install --yes mock ;
       fi
 
-    - if [[ $TEST_TARGET == 'branca_latest' ]]; then
-        pip install git+https://github.com/python-visualization/branca.git ;
-      fi
-
 # Test source distribution.
 install:
     - python setup.py sdist && version=$(python setup.py --version) && pushd dist  && pip install folium-${version}.tar.gz && popd
 
 script:
-    - python setup.py test
-    - find . -type f -name "*.py" ! -name 'conf.py' | xargs flake8 --max-line-length=100
+    - if [[ $TEST_TARGET == 'branca_release' ]]; then
+        python setup.py test ;
+      fi
+
+    - if [[ $TEST_TARGET == 'branca_latest' ]]; then
+        pip install git+https://github.com/python-visualization/branca.git ;
+        python setup.py test ;
+      fi
+
+    - if [[ $TEST_TARGET == 'coding_standards' ]]; then
+        find . -type f -name "*.py" ! -name 'conf.py' | xargs flake8 --max-line-length=100 ;
+      fi

examples/folium_vincent_markers.py

@@ -37,11 +37,17 @@
 vis3.to_json('vis3.json')
 
 # Map all buoys similar to https://github.com/python-visualization/folium#vincentvega-markers
-buoy_map = folium.Map(location=[46.3014, -123.7390], zoom_start=7,tiles='Stamen Terrain')
-popup1 = folium.Popup(max_width=800,).add_child(folium.Vega(vis1, width=500, height=250))
-folium.RegularPolygonMarker([47.3489, -124.708],fill_color='#43d9de', radius=12, popup=popup1).add_to(buoy_map)
-popup2 = folium.Popup(max_width=800,).add_child(folium.Vega(vis2, width=500, height=250))
-folium.RegularPolygonMarker([44.639, -124.5339],fill_color='#43d9de', radius=12, popup=popup2).add_to(buoy_map)
-popup3 = folium.Popup(max_width=800,).add_child(folium.Vega(vis3, width=500, height=250))
-folium.RegularPolygonMarker([46.216, -124.1280],fill_color='#43d9de', radius=12, popup=popup3).add_to(buoy_map)
+kw = dict(fill_color='#43d9de', radius=12)
+buoy_map = folium.Map(location=[46.3014, -123.7390],
+                      zoom_start=7, tiles='Stamen Terrain')
+
+popup1 = folium.Popup(max_width=800).add_child(folium.Vega(vis1, width=500, height=250))
+folium.RegularPolygonMarker([47.3489, -124.708], popup=popup1, **kw).add_to(buoy_map)
+
+popup2 = folium.Popup(max_width=800).add_child(folium.Vega(vis2, width=500, height=250))
+folium.RegularPolygonMarker([44.639, -124.5339], popup=popup2, **kw).add_to(buoy_map)
+
+popup3 = folium.Popup(max_width=800).add_child(folium.Vega(vis3, width=500, height=250))
+folium.RegularPolygonMarker([46.216, -124.1280], popup=popup3, **kw).add_to(buoy_map)
+
 buoy_map.save(outfile='NOAA_buoys.html')