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
8 changes: 7 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
0.2.0
~~~~~
- Correct rendering utf-8 IFrame (knil-sama https://github.com/python-visualization/branca/pull/18)
- Remove embedded IFrame's border (deelaka https://github.com/python-visualization/branca/pull/17)
- Let IFrame contents go fullscreen (sanga https://github.com/python-visualization/branca/pull/13)
- Add HTML Popup Class to element.py (samchorlton https://github.com/python-visualization/branca/pull/6)

0.1.0
~~~~~
- Separate branca from folium (bibmartin d678357)
- Enable HTML embedding in Html (samchorlton 90f6b13)

4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2013, Rob Story
Copyright (C) 2013, Martin Journois

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand All @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
9 changes: 5 additions & 4 deletions branca/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import branca.colormap as colormap
import branca.element as element

__version__ = 'master'
__version__ = '0.2.0'

__all__ = ['colormap',
'element',
]
__all__ = [
'colormap',
'element',
]
3 changes: 0 additions & 3 deletions pep8_test.sh

This file was deleted.

3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ def walk_subpkg(name):
version=extract_version(),
description='Generate complex HTML+JS pages with Python',
long_description=long_description,
author='Rob Story',
author_email='wrobstory@gmail.com',
author='Martin Journois',
url='https://github.com/python-visualization/branca',
keywords='data visualization',
classifiers=['Programming Language :: Python :: 2.7',
Expand Down