diff --git a/pyecharts/charts/basic_charts/bar.py b/pyecharts/charts/basic_charts/bar.py index 8b7c8f45..bf3b0841 100644 --- a/pyecharts/charts/basic_charts/bar.py +++ b/pyecharts/charts/basic_charts/bar.py @@ -14,7 +14,6 @@ class Bar(RectChart): def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): super().__init__(init_opts=init_opts) - self.options.update(yAxis=[opts.AxisOpts().opts]) def add_yaxis( self, diff --git a/pyecharts/charts/basic_charts/boxplot.py b/pyecharts/charts/basic_charts/boxplot.py index 4ad57d23..72097e4e 100644 --- a/pyecharts/charts/basic_charts/boxplot.py +++ b/pyecharts/charts/basic_charts/boxplot.py @@ -15,7 +15,6 @@ class Boxplot(RectChart): def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): super().__init__(init_opts=init_opts) - self.options.update(yAxis=[opts.AxisOpts().opts]) def add_yaxis( self, diff --git a/pyecharts/charts/basic_charts/effectscatter.py b/pyecharts/charts/basic_charts/effectscatter.py index 09217277..89422e8b 100644 --- a/pyecharts/charts/basic_charts/effectscatter.py +++ b/pyecharts/charts/basic_charts/effectscatter.py @@ -13,7 +13,6 @@ class EffectScatter(RectChart): def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): super().__init__(init_opts=init_opts) - self.options.update(yAxis=[opts.AxisOpts().opts]) def add_yaxis( self, diff --git a/pyecharts/charts/basic_charts/heatmap.py b/pyecharts/charts/basic_charts/heatmap.py index 128cbee9..8ac619c2 100644 --- a/pyecharts/charts/basic_charts/heatmap.py +++ b/pyecharts/charts/basic_charts/heatmap.py @@ -15,7 +15,6 @@ class HeatMap(RectChart): def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): super().__init__(init_opts=init_opts) - self.options.update(yAxis=[opts.AxisOpts().opts]) self.set_global_opts(visualmap_opts=opts.VisualMapOpts(orient="horizontal")) def add_yaxis( diff --git a/pyecharts/charts/basic_charts/kline.py b/pyecharts/charts/basic_charts/kline.py index adc01dd5..6b1fdd89 100644 --- a/pyecharts/charts/basic_charts/kline.py +++ b/pyecharts/charts/basic_charts/kline.py @@ -16,7 +16,6 @@ class Kline(RectChart): def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): super().__init__(init_opts=init_opts) - self.options.update(yAxis=[opts.AxisOpts().opts]) self.set_global_opts( xaxis_opts=opts.AxisOpts(is_scale=True), yaxis_opts=opts.AxisOpts(is_scale=True), diff --git a/pyecharts/charts/basic_charts/line.py b/pyecharts/charts/basic_charts/line.py index 9f2df706..edb0aa69 100644 --- a/pyecharts/charts/basic_charts/line.py +++ b/pyecharts/charts/basic_charts/line.py @@ -14,7 +14,6 @@ class Line(RectChart): def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): super().__init__(init_opts=init_opts) - self.options.update(yAxis=[opts.AxisOpts().opts]) def add_yaxis( self, diff --git a/pyecharts/charts/basic_charts/scatter.py b/pyecharts/charts/basic_charts/scatter.py index e0dc829a..6340d164 100644 --- a/pyecharts/charts/basic_charts/scatter.py +++ b/pyecharts/charts/basic_charts/scatter.py @@ -18,7 +18,6 @@ class Scatter(RectChart): def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): super().__init__(init_opts=init_opts) - self.options.update(yAxis=[opts.AxisOpts().opts]) def add_yaxis( self, diff --git a/pyecharts/charts/chart.py b/pyecharts/charts/chart.py index ab7e736b..b690ef3b 100644 --- a/pyecharts/charts/chart.py +++ b/pyecharts/charts/chart.py @@ -157,6 +157,10 @@ class Chart(Base): class RectChart(Chart): + def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()): + super().__init__(init_opts=init_opts) + self.options.update(xAxis=[opts.AxisOpts().opts], yAxis=[opts.AxisOpts().opts]) + def extend_axis( self, xaxis_data: Sequence = None, @@ -175,7 +179,6 @@ class RectChart(Chart): return self def add_xaxis(self, xaxis_data: Sequence): - self.options.update(xAxis=[opts.AxisOpts().opts]) self.options["xAxis"][0].update(data=xaxis_data) self._xaxis_data = xaxis_data return self diff --git a/test/test_line.py b/test/test_line.py index 2311c01a..31b210cb 100644 --- a/test/test_line.py +++ b/test/test_line.py @@ -1,15 +1,34 @@ -from nose.tools import eq_ +from unittest.mock import patch +from nose.tools import assert_in, eq_ + +from pyecharts import options as opts from pyecharts.charts import Line -def test_bar_base(): +@patch("pyecharts.render.engine.write_utf8_html_file") +def test_bar_base(fake_writer): c = ( Line() .add_xaxis(["A", "B", "C"]) .add_yaxis("series0", [1, 2, 4]) .add_yaxis("series1", [2, 3, 6]) ) + c.render() + _, content = fake_writer.call_args[0] eq_(c.theme, "white") eq_(c.renderer, "canvas") + + +@patch("pyecharts.render.engine.write_utf8_html_file") +def test_set_global_opts(fake_writer): + c = ( + Line() + .set_global_opts(xaxis_opts=opts.AxisOpts(is_inverse=True)) + .add_xaxis(["A", "B", "C"]) + .add_yaxis("series0", [1, 2, 4]) + .add_yaxis("series1", [2, 3, 6]) + ) c.render() + _, content = fake_writer.call_args[0] + assert_in('"inverse": true', content)