Skip to content

Commit 5f50773

Browse files
ocefpafocefpaf
committed
Merge pull request #337 from BibMartin/test_notebooks
test_notebooks
2 parents 878a98f + d347de7 commit 5f50773

14 files changed

Lines changed: 1084 additions & 13413 deletions

‎.travis.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ before_install:
1616
- conda update --yes --all
1717
- travis_retry conda create --yes -n test python=$PYTHON --file requirements.txt
1818
- source activate test
19-
- conda install --yes --file requirements-dev.txt
20-
- travis_retry conda install --yes pytest pandas vincent flake8
19+
- conda install --yes --file requirements-dev.txt;
20+
- if [[ "$PYTHON" == "3.4" ]]; then
21+
travis_retry conda install --yes nbconvert jupyter_client ipykernel;
22+
conda install --yes -c ioos geopandas;
23+
fi
2124
- if [[ "$PYTHON" != "3.5" ]]; then
2225
travis_retry conda install --yes mock ;
2326
fi

‎docs/examples/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.ipynb
2+
*.md

‎examples/Features.ipynb‎

Lines changed: 117 additions & 5714 deletions
Large diffs are not rendered by default.

‎examples/GeoPandas.ipynb‎

Lines changed: 26 additions & 37 deletions
Large diffs are not rendered by default.

‎examples/ImageOverlay.ipynb‎

Lines changed: 68 additions & 55 deletions
Large diffs are not rendered by default.

‎examples/Popups.ipynb‎

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

‎examples/clustered_markers.ipynb‎

Lines changed: 119 additions & 206 deletions
Large diffs are not rendered by default.

‎examples/folium_examples.ipynb‎

Lines changed: 516 additions & 877 deletions
Large diffs are not rendered by default.

‎examples/marker_color_icon_examples.ipynb‎

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

0 commit comments

Comments
 (0)