Skip to content

Commit 4baa5fa

Browse files
authored
Merge pull request #706 from ocefpaf/agg_markercluster
aggregate all marker cluster examples in a single notebook
2 parents 853b5c0 + 4809754 commit 4baa5fa

File tree

6 files changed

+316
-384
lines changed

6 files changed

+316
-384
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,17 @@ matrix:
1111
include:
1212
- python: 2.7
1313
env: TEST_TARGET=default
14-
- python: 3.5
15-
env: TEST_TARGET=default
1614
- python: 3.6
1715
env: TEST_TARGET=default
1816
- python: 3.6
1917
env: TEST_TARGET=notebooks
2018
- python: 3.6
2119
env: TEST_TARGET=latest_branca
22-
- python: 3.6
23-
env: TEST_TARGET=latest_branca
2420
allow_failures:
2521
- python: 2.7
2622
env: TEST_TARGET=latest_branca
2723
- python: 3.6
2824
env: TEST_TARGET=latest_branca
29-
- python: 3.6
30-
env: TEST_TARGET=notebooks
3125

3226
before_install:
3327
- wget http://bit.ly/miniconda -O miniconda.sh

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
API changes
1717

18+
- removed features `MarkerCluster` in lieu of the plugin version (ocefpaf #704)
1819
- `choropleth` now takes a single `geo_data` instad of `geo_path`/`geo_str`
1920
leaving the parsing to `GeoJSON`, remove the unused `data_out` option,
2021
add geopandas support (ocefpaf #702)

examples/1000_MarkerCluster.ipynb

Lines changed: 0 additions & 343 deletions
This file was deleted.

examples/GulfStreamImageOverlay.ipynb

Lines changed: 5 additions & 7 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)