Merge remote-tracking branch 'upstream/master'

Author: joshuacano

.travis.yml

@@ -2,30 +2,43 @@ language: python
 
 sudo: false
 
+python:
+    - 2.7
+    - 3.4
+    - 3.5
+
 env:
-    - PYTHON="2.7"
-    - PYTHON="3.4"
-    - PYTHON="3.5"
+    - TEST_TARGET=branca_release
+    - TEST_TARGET=branca_latest
+    - TEST_TARGET=coding_standards
 
 before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
-    - conda config --add channels ioos -f
     - conda update --yes --all
-    - travis_retry conda create --yes -n test python=$PYTHON nomkl --file requirements.txt
-    - source activate test
-    - conda install --yes --file requirements-dev.txt;
-    - pip install git+https://github.com/python-visualization/branca.git@befdf0bb29ecea488c79147fa1a851e15bfe5a10
-    - if [[ "$PYTHON" == "3.4" ]]; then
-        travis_retry conda install --yes nbconvert jupyter_client ipykernel;
-        conda install --yes -c ioos geopandas;
-      fi
-    - if [[ "$PYTHON" != "3.5" ]]; then
-        travis_retry conda install --yes mock ;
+    - conda config --add channels conda-forge --force
+    - conda create --yes -n TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt --file requirements-dev.txt
+    - source activate TEST
+
+    - if [[ "$TRAVIS_PYTHON_VERSION" != "3.5" ]]; then
+        conda install --yes mock ;
       fi
-    - travis_retry pip install
+
+# 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

CHANGES.txt

@@ -1,15 +1,18 @@
 0.3.0
 ~~~~~
 
-- Add fullscreen plugin (sanga #437)
-- Add ColorLine object (bibmartin #449)
-- Add smooth_factor option to GeoJSON, TopoJSON and Choropleth (JamesGardiner #428)
-- Add options to fullscreen plugin (qingkaikong #468)
-- Add options to LayerControl (qingkaikong #473)
+- Added fullscreen plugin (sanga #437)
+- Added ColorLine object (bibmartin #449)
+- Added smooth_factor option to GeoJSON, TopoJSON and Choropleth (JamesGardiner #428)
+- Added options to fullscreen plugin (qingkaikong #468)
+- Added options to LayerControl (qingkaikong #473)
+- Added text path (talespaiva #451 and #474)
+- Update font-awesome to 4.6.3 (ocefpaf #478)
 
 Bug Fixes
 
 - Fix MIME type (text/plain) is not executable (talespaiva #440)
+- Update Travis-CI testing to incorporate branca and fix notebook tests (ocefpaf #436)
 
 0.2.1
 ~~~~~