Merge remote-tracking branch 'remotes/upstream/master' into python-2-deprecation

Author: Conengmo

.github/CONTRIBUTING.md

@@ -58,13 +58,18 @@ First of all, thanks for your interest in contributing!
     git checkout -b name-of-your-branch
     ```
   4. Make change to your local copy of the folium repository
-  5. Commit those changes
+  5. Make sure the tests pass:
+    * in the repository folder do `pip install -e .`  (needed for notebook tests)
+    * along with all the dependencies install `phantomjs` via `npm install -g phantomjs` or by downloading it from [here](http://phantomjs.org/download.html) and installing manually
+    * run `python -m pytest tests`
+    * resolve all errors
+  6. Commit those changes
     ```
     git add file1 file2 file3
     git commit -m 'a descriptive commit message'
     ```
-  6. Push your updated branch to your fork
+  7. Push your updated branch to your fork
     ```
     git push origin name-of-your-branch
     ```
-  7. [Open a pull request](https://help.github.com/articles/creating-a-pull-request/) to the python-visualization/folium
+  8. [Open a pull request](https://help.github.com/articles/creating-a-pull-request/) to the python-visualization/folium

.gitignore

@@ -0,0 +1,15 @@
+*.egg-info/
+*.pyc
+.ipynb_checkpoints
+.pytest_cache
+build/
+dist/
+docs/_build/
+docs/quickstart.ipynb
+examples/results/*
+.cache/
+.idea/
+/*.xml
+/codestyles/*.xml
+/_mac/*.xml
+/inspection/*.xml

.travis.yml

@@ -1,4 +1,4 @@
-language: python
+language: minimal
 
 sudo: false
 
@@ -9,33 +9,32 @@ env:
 matrix:
   fast_finish: true
   include:
-  - python: 2.7
-    env: TEST_TARGET=default
-  - python: 3.6
-    env: TEST_TARGET=default
-  - python: 3.6
-    env: TEST_TARGET=notebooks
-  - python: 3.6
-    env: TEST_TARGET=latest_branca
-  - python: 3.6
-    env: TEST_TARGET=docs
+  - name: default-python2
+    env: TEST_TARGET=default PY=2.7
+  - name: default
+    env: TEST_TARGET=default PY=3.7
+  - name: notebooks
+    env: TEST_TARGET=notebooks PY=3.7
+  - name: latest_branca
+    env: TEST_TARGET=latest_branca PY=3.7
+  - name: docs
+    env: TEST_TARGET=docs PY=3.7
   allow_failures:
-  - python: 2.7
-    env: TEST_TARGET=latest_branca
-  - python: 3.6
-    env: TEST_TARGET=latest_branca
+  - name: latest_branca
+    env: TEST_TARGET=latest_branca PY=3.7
 
 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 --set always_yes yes --set changeps1 no --set show_channel_urls true
   - conda update conda
+  - conda config --remove channels defaults --force
   - conda config --add channels conda-forge --force
-  - conda create --name TEST python=$TRAVIS_PYTHON_VERSION phantomjs --file requirements.txt --file requirements-dev.txt
+  - conda create --name TEST python=$PY phantomjs --file requirements.txt --file requirements-dev.txt
   - source activate TEST
 
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+  - if [[ "$PY" == "2.7" ]]; then
       conda install mock ;
     fi
 
@@ -49,18 +48,18 @@ script:
     fi
 
   - if [[ $TEST_TARGET == 'default' ]]; then
-      py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
+      pytest -vv --ignore=tests/notebooks/test_notebooks.py ;
     fi
 
   - if [[ $TEST_TARGET == 'latest_branca' ]]; then
       conda uninstall branca ;
       pip install git+https://github.com/python-visualization/branca.git ;
-      py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
+      pytest -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,I100 --max-line-length=100 --show-source ; done ;
-      py.test -vv tests/notebooks/test_notebooks.py ;
+      pytest -vv tests/notebooks/test_notebooks.py ;
     fi
 
   - if [[ $TEST_TARGET == 'docs' ]]; then
@@ -77,3 +76,17 @@ script:
 doctr:
   require-master: true
   sync: False
+
+deploy:
+  skip_cleanup: true
+  provider: pypi
+  user: ocefpaf
+  password:
+    secure: "BdJc76Z+DnmmamZSX+QCGZDnf+FW/JQOnVZ2t59r2r2RM4860Wf6GSL/Ncw6v8G3sOghWQcMzFdY5e6aNzAW0Ddm2YKHAsfxgurbEsnlzwsNPBWv2280ca7TtlFk2JkqhtYQOkoBFbA8+e/lC8ZC6aAVffQAT1NE4lEs0/Jd+TA="
+  distributions: sdist bdist_wheel
+  upload_docs: no
+  on:
+    repo: python-visualization/folium
+    tags: true
+    all_branches: master
+    condition: '$TEST_TARGET == "default"'

CHANGES.txt

@@ -1,3 +1,25 @@
+0.7.0
+~~~~~
+
+- Update leaflet to 1.3.4 (ocefpaf #939)
+- More options (tms, opacity, kwargs) in TileLayer (mpickering #948)
+- Add MousePosition plugin (btozer #916)
+- Add Minimap plugin (talbertc-usgs #968)
+- Replace Rawgit CDN with Githack (jtbaker #1002)
+- Handling of NaN and missing values in choropleth (FloChehab #1005)
+
+API changes
+
+- `threshold_scale` argument of choropleth is replaced by `bins` (FloChehab #1005)
+
+Bug Fixes
+
+- Fix wrong default value for fmt argument of WmsTileLayer (conengmo #950)
+- Fix icon_create_function argument in MarkerCluster (conengmo #954)
+- Update stylesheet url in TimestampedGeoJson (frodebjerke #963)
+- Use Javascript template literals in Tooltip and Popup (jtbaker #955 #962)
+- Proper scaling on mobile phones (conengmo #992)
+
 0.6.0
 ~~~~~
 
@@ -18,6 +40,10 @@
 - Ingest any object that __geo_interface__ (ocefpaf #880)
 - Added `FeatureGroupSubGroup` plugin (shtrom #875)
 - Added `duration` option to `TimestampedGeoJson` (andy23512 #894)
+- Added `zoom_control` to `Map` to toggle zoom controls as per enhancement (#795) (okomarov #899)
+- Change default `date_options` in TimestampedGeoJson (andy23512 #914)
+- Added gradient argument to HeatMapWithTime (jtbaker #925)
+- Added `Tooltip` and `GeoJsonTooltip` classes (jtbaker #883)
 
 API changes
 
@@ -34,6 +60,7 @@ Bug Fixes
 - Fix disappearing layer control when using FastMarkerCluster (conengmo #866)
 - Host heatmap.js to circumvent adblockers (conengmo #886)
 - Fix permission error in Map._to_png() due to tempfile (conengmo #887)
+- Replace strftime use in TimesliderChoropleth example (conengmo #919)
 
 0.5.0
 ~~~~~

README.rst

@@ -1,11 +1,20 @@
-.. image:: https://badge.fury.io/py/folium.png
-   :target: http://badge.fury.io/py/folium
-.. image:: https://api.travis-ci.org/python-visualization/folium.png?branch=master
-   :target: https://travis-ci.org/python-visualization/folium
-.. image:: https://badges.gitter.im/Join%20Chat.svg
-   :target: https://gitter.im/python-visualization/folium?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-.. image:: https://zenodo.org/badge/18669/python-visualization/folium.svg
+|PyPI| |Travis| |Gitter| |DOI|
+
+.. |PyPI| image:: https://img.shields.io/pypi/v/folium.svg
+    :target: https://pypi.python.org/pypi/folium/
+    :alt: PyPI Package
+
+.. |Travis| image:: https://travis-ci.org/python-visualization/folium.svg?branch=master
+    :target: https://travis-ci.org/python-visualization/folium
+    :alt: Travis Build Status
+
+.. |Gitter| image:: https://badges.gitter.im/python-visualization/folium.svg
+    :target: https://gitter.im/python-visualization/folium
+    :alt: Gitter
+
+.. |DOI| image:: https://zenodo.org/badge/18669/python-visualization/folium.svg
    :target: https://zenodo.org/badge/latestdoi/18669/python-visualization/folium
+   :alt: DOI
 
 folium
 ======
@@ -35,23 +44,28 @@ or
 Documentation
 -------------
 
-http://python-visualization.github.io/folium/docs-v0.5.0/
+https://python-visualization.github.io/folium/docs-v0.6.0/
 
 The documentation for the development version can be found here:
-http://python-visualization.github.io/folium/docs-master/
-
-Note that the documentation on Read the Docs is for the deprecated version
-0.2.0.
+https://python-visualization.github.io/folium/docs-master/
 
 Gallery
 -------
 
 There are two galleries of Jupyter notebooks with examples, which you can see
 using Jupyter's nbviewer:
 
-http://nbviewer.jupyter.org/github/python-visualization/folium/tree/master/examples/
+https://nbviewer.jupyter.org/github/python-visualization/folium/tree/master/examples/
 
 https://nbviewer.jupyter.org/github/python-visualization/folium_contrib/tree/master/notebooks/
 
+Contributing
+------------
+
+We love contributions!  folium is open source, built on open source,
+and we'd love to have you hang out in our community.
+
+See `our complete contributor's guide <https://github.com/python-visualization/folium/blob/master/.github/CONTRIBUTING.md>`_ for more info.
+
 
 .. |folium| image:: http://python-visualization.github.io/folium/docs-master/_images/folium_logo.jpg

docs/conf.py

@@ -11,7 +11,11 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys
+import os
+
+# Use the currently checked out folium of this folder
+sys.path.insert(0, os.path.abspath(os.pardir))
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

examples/Features.ipynb

@@ -202,7 +202,11 @@
     }
    ],
    "source": [
-    "from altair import Chart, load_dataset\n",
+    "\n",
+    "try: \n",
+    "    from altair import Chart, load_dataset\n",
+    "except TypeError:\n",
+    "    print('Try updating your python version to 3.5.3 or above')\n",
     "\n",
     "# load built-in dataset as a pandas DataFrame\n",
     "cars = load_dataset('cars')\n",