Merge branch 'master' into fast-marker-cluster

Author: ocefpaf

.gitattributes

@@ -0,0 +1 @@
+folium/_version.py export-subst

.stickler.yml

@@ -0,0 +1,6 @@
+linters:
+  flake8:
+    max-line-length: 100
+    max-complexity: 10
+files:
+  ignore: ['*.ipynb', 'conf.py']

.travis.yml

@@ -10,36 +10,36 @@ matrix:
   fast_finish: true
   include:
   - python: 2.7
-    env: TEST_TARGET=branca_release
-  - python: 3.5
-    env: TEST_TARGET=branca_release
-  - python: 3.5
-    env: TEST_TARGET=coding_standards
+    env: TEST_TARGET=default
   - python: 3.5
+    env: TEST_TARGET=default
+  - python: 3.6
+    env: TEST_TARGET=default
+  - python: 3.6
     env: TEST_TARGET=notebooks
   - python: 2.7
-    env: TEST_TARGET=branca_latest
-  - python: 3.5
-    env: TEST_TARGET=branca_latest
+    env: TEST_TARGET=latest_branca
+  - python: 3.6
+    env: TEST_TARGET=latest_branca
   allow_failures:
   - python: 2.7
-    env: TEST_TARGET=branca_latest
-  - python: 3.5
-    env: TEST_TARGET=branca_latest
+    env: TEST_TARGET=latest_branca
+  - python: 3.6
+    env: TEST_TARGET=latest_branca
 
 before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
     - conda update --yes --all
     - conda config --add channels conda-forge --force
-    - conda create --yes -n TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt --file requirements-dev.txt
+    - conda create --yes -n TEST python=$TRAVIS_PYTHON_VERSION phantomjs --file requirements.txt --file requirements-dev.txt
     - source activate TEST
 
-    - if [[ "$TRAVIS_PYTHON_VERSION" != "3.5" ]]; then
+    - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
         conda install --yes mock ;
       fi
-    - if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then
+    - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
         conda install --yes doctr ;
       fi
 
@@ -48,21 +48,17 @@ install:
     - python setup.py sdist && version=$(python setup.py --version) && pushd dist  && pip install folium-${version}.tar.gz && popd
 
 script:
-    - if [[ $TEST_TARGET == 'branca_release' ]]; then
+    - if [[ $TEST_TARGET == 'default' ]]; then
         py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
       fi
 
-    - if [[ $TEST_TARGET == 'branca_latest' ]]; then
+    - if [[ $TEST_TARGET == 'latest_branca' ]]; 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 ;
-        for file in $(find . -type f -name "*.ipynb"); do jupyter nbconvert --template=tests/strip_markdown.tpl --stdout --to python $file | grep -v '^get_ipython' | flake8 - --ignore=W391,E226,E402 --max-line-length=100 --show-source ; done ;
+        py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
       fi
 
     - if [[ $TEST_TARGET == 'notebooks' ]]; then
+        for file in $(find . -type f -name "*.ipynb"); do jupyter nbconvert --template=tests/strip_markdown.tpl --stdout --to python $file | grep -v '^get_ipython' | flake8 - --ignore=W391,E226,E402 --max-line-length=100 --show-source ; done ;
         py.test -vv tests/notebooks/test_notebooks.py ;
-        doctr deploy --built-docs=examples/results --gh-pages-docs=gallery ;
+        doctr deploy --built-docs=examples/results gallery ;
       fi

CHANGES.txt

@@ -1,7 +1,12 @@
+0.4.0
+~~~~~
+- Added support for subdomains options in TileLayer (damselem #623)
+
 0.3.0
 ~~~~~
 
 - Added `FastMarkerCluster` (James Gardiner #585 (proposed by @ruoyu0088))
+- Added style option to 'Timestamped geojson' plugin (soymsk #627)
 - Switched to `leaflet 1.0.1` (juoceano #531 and ocefpaf #535)
 - Added `continuous_world`, `world_copy_jump`, and `no_wrap` options (ocefpaf #508)
 - Update font-awesome to 4.6.3 (ocefpaf #478)
@@ -13,6 +18,8 @@
 - Added `fullscreen` plugin (sanga #437)
 - Added `smooth_factor `option to `GeoJSON`, `TopoJSON` and `Choropleth` (JamesGardiner #428)
 - `Map` object now accepts Leaflet global switches (sgvandijk #424)
+- Added weight option to CircleMarker (palewire #581)
+- Added requests support to enable http(s) and ftp for geo_path parameter (jreades #602)
 
 Bug Fixes
 
@@ -21,6 +28,7 @@ Bug Fixes
 - Fixed MIME type (text/plain) is not executable (talespaiva #440)
 - Update Travis-CI testing to incorporate branca and fix notebook tests (ocefpaf #436)
 - Removed MultiPolyLine and MultiPolygon, both are handled by PolyLine and PolyLine in leaflet 1.0.* (ocefpaf #554)
+- Removed deprecated MapQuest tiles (HashCode55 #562)
 
 0.2.1
 ~~~~~

MANIFEST.in

@@ -4,3 +4,5 @@ recursive-include folium *.py
 recursive-include folium *.js
 recursive-include folium/plugins *
 recursive-include folium/templates *
+include versioneer.py
+prune examples/

docs/contributing.rst

@@ -1,16 +1,10 @@
-Contributing
-============
+Contributing to folium
+======================
 
-Choose the sandbox folder of your choice (`~/sandbox` for example)
-::
+We welcome contributions to folum in many forms.
 
-$ cd ~/sandbox
+Examples of contributions include:
 
-Clone `folium` from github:
-::
-
-$ git clone https://github.com/python-visualization/folium
-
-Push code to your fors, and write a pull request.
-
-TODO: end up this section.
+* Code patches
+* Documentation improvements
+* Bug reports and patch reviews

docs/examples.rst

@@ -1,10 +1,7 @@
 Examples
 ========
 
-You shall take a look at folium's example gallery_.
+Take a look at folium's example gallery_.
 
 .. _gallery: http://nbviewer.jupyter.org/github/python-visualization/folium/tree/master/examples/
 
-If this is not enough, you may find fancier examples here_.
-
-.. _here: http://nbviewer.jupyter.org/github/ocefpaf/folium_notebooks/tree/master/