Skip to content

Commit 7def5e0

Browse files
authored
Merge pull request #595 from ocefpaf/v0.3.0
V0.3.0
2 parents 8fa74b9 + ee1ffd2 commit 7def5e0

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

.stickler.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
linters:
2+
flake8:
3+
pep8:
4+
files:
5+
ignore: ['*.ipynb']

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ matrix:
1111
include:
1212
- python: 2.7
1313
env: TEST_TARGET=branca_release
14-
- python: 3.5
14+
- python: 3.6
1515
env: TEST_TARGET=branca_release
16-
- python: 3.5
16+
- python: 3.6
1717
env: TEST_TARGET=coding_standards
18-
- python: 3.5
18+
- python: 3.6
1919
env: TEST_TARGET=notebooks
2020
- python: 2.7
2121
env: TEST_TARGET=branca_latest
22-
- python: 3.5
22+
- python: 3.6
2323
env: TEST_TARGET=branca_latest
2424
allow_failures:
2525
- python: 2.7
2626
env: TEST_TARGET=branca_latest
27-
- python: 3.5
27+
- python: 3.6
2828
env: TEST_TARGET=branca_latest
2929

3030
before_install:
@@ -36,10 +36,10 @@ before_install:
3636
- conda create --yes -n TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt --file requirements-dev.txt
3737
- source activate TEST
3838

39-
- if [[ "$TRAVIS_PYTHON_VERSION" != "3.5" ]]; then
39+
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
4040
conda install --yes mock ;
4141
fi
42-
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then
42+
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
4343
conda install --yes doctr ;
4444
fi
4545

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ recursive-include folium *.py
44
recursive-include folium *.js
55
recursive-include folium/plugins *
66
recursive-include folium/templates *
7+
prune examples/

folium/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
TopoJson, WmsTileLayer
1818
)
1919

20-
__version__ = '0.3.0.dev'
20+
__version__ = '0.3.0'
2121

2222
__all__ = [
2323
'CssLink',

0 commit comments

Comments
 (0)