Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .stickler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
linters:
flake8:
pep8:
files:
ignore: ['*.ipynb']
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ recursive-include folium *.py
recursive-include folium *.js
recursive-include folium/plugins *
recursive-include folium/templates *
prune examples/
2 changes: 1 addition & 1 deletion folium/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
TopoJson, WmsTileLayer
)

__version__ = '0.3.0.dev'
__version__ = '0.3.0'

__all__ = [
'CssLink',
Expand Down