From 78b2258678c2fab31c58782d73a78b87e9f6b754 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Sun, 5 Mar 2017 14:29:13 -0300 Subject: [PATCH 01/12] v0.3.0 --- folium/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folium/__init__.py b/folium/__init__.py index d8eefd8b21..ea4f8fe8be 100644 --- a/folium/__init__.py +++ b/folium/__init__.py @@ -17,7 +17,7 @@ TopoJson, WmsTileLayer ) -__version__ = '0.3.0.dev' +__version__ = '0.3.0' __all__ = [ 'CssLink', From de49f4956980324d4f222ee2614f21755deaed86 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Sun, 5 Mar 2017 14:29:26 -0300 Subject: [PATCH 02/12] don't package examples --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index fc441e0581..b41c3a31f7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,3 +4,4 @@ recursive-include folium *.py recursive-include folium *.js recursive-include folium/plugins * recursive-include folium/templates * +prune examples/ From 9cab69a5662f67c84307c5331fcf1d1c9647cc0f Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Sun, 5 Mar 2017 14:40:32 -0300 Subject: [PATCH 03/12] stickler config --- .stickler.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .stickler.yml diff --git a/.stickler.yml b/.stickler.yml new file mode 100644 index 0000000000..deaa15a6a8 --- /dev/null +++ b/.stickler.yml @@ -0,0 +1,5 @@ +linters: + flake8: + pep8: +files: + ignore: ['*.ipynb'] From ee1ffd2c7deb5862c1f8e6411743c44f2b3122e2 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Sun, 5 Mar 2017 14:42:14 -0300 Subject: [PATCH 04/12] Run tests on Python 3.6 --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 525dca3aae..79e68c9d37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,20 +11,20 @@ matrix: include: - python: 2.7 env: TEST_TARGET=branca_release - - python: 3.5 + - python: 3.6 env: TEST_TARGET=branca_release - - python: 3.5 + - python: 3.6 env: TEST_TARGET=coding_standards - - python: 3.5 + - python: 3.6 env: TEST_TARGET=notebooks - python: 2.7 env: TEST_TARGET=branca_latest - - python: 3.5 + - python: 3.6 env: TEST_TARGET=branca_latest allow_failures: - python: 2.7 env: TEST_TARGET=branca_latest - - python: 3.5 + - python: 3.6 env: TEST_TARGET=branca_latest before_install: @@ -36,10 +36,10 @@ before_install: - 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 + - 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 From f191524b99d022a4e8cf8baf0b6dfd8f06d45793 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 11:39:25 -0300 Subject: [PATCH 05/12] update changelog --- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 286ba4cd57..d9421c35c6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,7 @@ - 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) Bug Fixes @@ -20,6 +21,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 ~~~~~ From e0fb9ce93356d21bca1247b3015ebf4d2f0d5234 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 11:41:16 -0300 Subject: [PATCH 06/12] run default on py35 and py34 too --- .travis.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79e68c9d37..55d702a52b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,22 +10,26 @@ matrix: fast_finish: true include: - python: 2.7 - env: TEST_TARGET=branca_release + env: TEST_TARGET=default - python: 3.6 - env: TEST_TARGET=branca_release + env: TEST_TARGET=default + - python: 3.5 + env: TEST_TARGET=default + - python: 3.4 + env: TEST_TARGET=default - python: 3.6 env: TEST_TARGET=coding_standards - python: 3.6 env: TEST_TARGET=notebooks - python: 2.7 - env: TEST_TARGET=branca_latest + env: TEST_TARGET=latest_branca - python: 3.6 - env: TEST_TARGET=branca_latest + env: TEST_TARGET=latest_branca allow_failures: - python: 2.7 - env: TEST_TARGET=branca_latest + env: TEST_TARGET=latest_branca - python: 3.6 - env: TEST_TARGET=branca_latest + env: TEST_TARGET=latest_branca before_install: - wget http://bit.ly/miniconda -O miniconda.sh @@ -48,11 +52,11 @@ 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 From 6180ffb6e737641ecaf5f1e7b305e497fd93be2b Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 11:49:27 -0300 Subject: [PATCH 07/12] fix order --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55d702a52b..bc1a76ba75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,11 @@ matrix: include: - python: 2.7 env: TEST_TARGET=default - - python: 3.6 + - python: 3.4 env: TEST_TARGET=default - python: 3.5 env: TEST_TARGET=default - - python: 3.4 + - python: 3.6 env: TEST_TARGET=default - python: 3.6 env: TEST_TARGET=coding_standards From 2eed611449cd99ac2ead818886810a845a77ab6c Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 11:49:39 -0300 Subject: [PATCH 08/12] use pycodestyle --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 68c086e794..ef3e0855c6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ -flake8 +pycodestyle pytest nbconvert jupyter_client From 70e1b120f518a5fab337a99bd3638557c89c5595 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 11:49:49 -0300 Subject: [PATCH 09/12] fix lint --- folium/plugins/scroll_zoom_toggler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folium/plugins/scroll_zoom_toggler.py b/folium/plugins/scroll_zoom_toggler.py index 1390e63707..b68c33cfc6 100644 --- a/folium/plugins/scroll_zoom_toggler.py +++ b/folium/plugins/scroll_zoom_toggler.py @@ -37,7 +37,7 @@ def __init__(self): {% macro html(this,kwargs) %} scroll {% endmacro %} From 8796815fac2d649128464dbabd1a2fd90a1ce246 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 11:49:57 -0300 Subject: [PATCH 10/12] test stickler --- folium/features.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/folium/features.py b/folium/features.py index 57c472a100..1b5ebd25a8 100644 --- a/folium/features.py +++ b/folium/features.py @@ -68,8 +68,6 @@ def __init__(self, url, name=None, layers=None, styles=None, format=None, self.format = format if format else 'image/jpeg' self.transparent = transparent self.version = version - # FIXME: Should be map CRS! - # self.crs = crs if crs else 'null self._template = Template(u""" {% macro script(this, kwargs) %} var {{this.get_name()}} = L.tileLayer.wms( @@ -129,7 +127,7 @@ def __init__(self, location, color='black', opacity=1, weight=2, number_of_sides=4, rotation=0, radius=15, popup=None): super(RegularPolygonMarker, self).__init__(location, popup=popup) self._name = 'RegularPolygonMarker' - self.color = color + self.color=color self.opacity = opacity self.weight = weight self.fill_color = fill_color From 4b02afc33ad456ed8b5455e767803ab54fb916d1 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 11:52:16 -0300 Subject: [PATCH 11/12] fix lint --- folium/features.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folium/features.py b/folium/features.py index 1b5ebd25a8..35668e5df7 100644 --- a/folium/features.py +++ b/folium/features.py @@ -127,7 +127,7 @@ def __init__(self, location, color='black', opacity=1, weight=2, number_of_sides=4, rotation=0, radius=15, popup=None): super(RegularPolygonMarker, self).__init__(location, popup=popup) self._name = 'RegularPolygonMarker' - self.color=color + self.color = color self.opacity = opacity self.weight = weight self.fill_color = fill_color From 935937267b23c0c43433e39e94bfc6b9b86f332d Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 6 Mar 2017 12:02:15 -0300 Subject: [PATCH 12/12] Use stickler for coding standards --- .stickler.yml | 7 ++++--- .travis.yml | 8 +------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.stickler.yml b/.stickler.yml index deaa15a6a8..734d07974a 100644 --- a/.stickler.yml +++ b/.stickler.yml @@ -1,5 +1,6 @@ linters: - flake8: - pep8: + flake8: + max-line-length: 100 + max-complexity: 10 files: - ignore: ['*.ipynb'] + ignore: ['*.ipynb', 'conf.py'] diff --git a/.travis.yml b/.travis.yml index bc1a76ba75..7e2837f436 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,6 @@ matrix: env: TEST_TARGET=default - python: 3.6 env: TEST_TARGET=default - - python: 3.6 - env: TEST_TARGET=coding_standards - python: 3.6 env: TEST_TARGET=notebooks - python: 2.7 @@ -61,12 +59,8 @@ script: 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 ; - 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 ; fi