Skip to content

Commit c35e2bb

Browse files
committed
Merge branch 'release/v0.13.4'
2 parents a8c34e7 + 81c717d commit c35e2bb

5 files changed

Lines changed: 24 additions & 4 deletions

File tree

‎README.rst‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,27 @@ Python Wrapper for NVD3 - It's time for beautiful charts
1111
.. _Oz: https://github.com/oz123/
1212

1313
.. image:: https://api.travis-ci.org/areski/python-nvd3.png?branch=develop
14+
:target: https://travis-ci.org/areski/python-nvd3
1415

1516
.. image:: https://coveralls.io/repos/areski/python-nvd3/badge.png?branch=develop
1617
:target: https://coveralls.io/r/areski/python-nvd3?branch=develop
1718

19+
.. image:: https://pypip.in/version/python-nvd3/badge.svg
20+
:target: https://pypi.python.org/pypi/python-nvd3/
21+
:alt: Latest Version
22+
23+
.. image:: https://pypip.in/download/python-nvd3/badge.svg
24+
:target: https://pypi.python.org/pypi/python-nvd3/
25+
:alt: Downloads
26+
27+
.. image:: https://pypip.in/py_versions/python-nvd3/badge.svg
28+
:target: https://pypi.python.org/pypi/python-nvd3/
29+
:alt: Supported Python versions
30+
31+
.. image:: https://pypip.in/license/python-nvd3/badge.svg
32+
:target: https://pypi.python.org/pypi/python-nvd3/
33+
:alt: License
34+
1835
NVD3 is an attempt to build re-usable charts and chart components
1936
for d3.js without taking away the power that d3.js offers you.
2037

‎nvd3/NVD3Chart.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,9 @@ def add_serie(self, y, x, name=None, extra=None, **kwargs):
282282
_end = (" + '" + str(_end) + "'") if _end else ''
283283
self.tooltip_condition_string += "var y = " + _start + " String(y) " + _end + ";\n"
284284

285-
self.serie_no += 1
286-
self.series.append(data_keyvalue)
285+
#Increment series counter & append
286+
self.serie_no += 1
287+
self.series.append(data_keyvalue)
287288

288289
def add_chart_extras(self, extras):
289290
"""

‎nvd3/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Project location : https://github.com/areski/python-nvd3
1010
"""
1111

12-
__version__ = '0.13.3'
12+
__version__ = '0.13.4'
1313
__all__ = ['lineChart', 'pieChart', 'lineWithFocusChart',
1414
'stackedAreaChart', 'multiBarHorizontalChart',
1515
'linePlusBarChart', 'cumulativeLineChart',

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def find_package_data(where='.', package='',
9696

9797
setup(
9898
name='python-nvd3',
99-
version='0.13.3',
99+
version='0.13.4',
100100
description="Python NVD3 - Chart Library for d3.js",
101101
long_description=read('README.rst'),
102102
keywords='plot, graph, nvd3, d3',

‎update_version.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ sed -i -e "s/version='.*'/version='$1'/g" setup.py
1313
git commit -a -m "Update to version v$1"
1414
git flow release finish v$1
1515
python setup.py sdist upload -r pypi
16+
17+
git push origin develop; git push origin master; git push --tags

0 commit comments

Comments
 (0)