Clean code #1081

chenjiandongx · 2019-05-06T16:39:07Z

本次 PR 内容，

整理代码
新增示例

codecov-io · 2019-05-06T16:39:12Z

Codecov Report

Merging #1081 into dev will increase coverage by 0.49%.
The diff coverage is 83.33%.

@@            Coverage Diff             @@
##              dev    #1081      +/-   ##
==========================================
+ Coverage   80.92%   81.42%   +0.49%     
==========================================
  Files          82       83       +1     
  Lines        1809     1787      -22     
==========================================
- Hits         1464     1455       -9     
+ Misses        345      332      -13

Impacted Files	Coverage Δ
pyecharts/__init__.py	`100% <ø> (ø)`	⬆️
pyecharts/charts/__init__.py	`100% <ø> (ø)`	⬆️
pyecharts/charts/basic_charts/bar.py	`100% <ø> (ø)`	⬆️
pyecharts/_version.py	`100% <ø> (ø)`	⬆️
pyecharts/charts/basic_charts/bmap.py	`100% <100%> (ø)`	⬆️
test/test_series_options.py	`100% <100%> (ø)`	⬆️
test/test_bmap.py	`100% <100%> (ø)`	⬆️
test/test_bar.py	`100% <100%> (ø)`	⬆️
test/test_sunburst.py	`100% <100%> (ø)`	⬆️
pyecharts/options/global_options.py	`83.92% <100%> (ø)`	⬆️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 07f1c78...43817fc. Read the comment docs.

sunhailin-Leo · 2019-05-07T01:50:36Z

pyecharts/render/templates/macro

        {% endif %}
+        {% for js in c.js_functions.items %}


这个 js 放在 setOption 后面会影响 echarts.registerMap 这个函数

#!/usr/bin/env python # coding=utf-8 import asyncio from aiohttp import TCPConnector, ClientSession import pyecharts.options as opts from pyecharts.charts import Map """ Gallery 使用 pyecharts 1.0.0 参考地址: https://echarts.baidu.com/examples/editor.html?c=map-HK 目前无法实现的功能: 1、不知道小红点咋去掉,无伤大雅 """ async def get_json_data(url: str) -> dict: async with ClientSession(connector=TCPConnector(ssl=False)) as session: async with session.get(url=url) as response: return await response.json() # 获取官方的数据 data = asyncio.run( get_json_data(url="https://echarts.baidu.com/examples/data/asset/geo/HK.json") ) map_data = [ ["中西区", 20057.34], ["湾仔", 15477.48], ["东区", 31686.1], ["南区", 6992.6], ["油尖旺", 44045.49], ["深水埗", 40689.64], ["九龙城", 37659.78], ["黄大仙", 45180.97], ["观塘", 55204.26], ["葵青", 21900.9], ["荃湾", 4918.26], ["屯门", 5881.84], ["元朗", 4178.01], ["北区", 2227.92], ["大埔", 2180.98], ["沙田", 9172.94], ["西贡", 3368], ["离岛", 806.98], ] name_map_data = { "Central and Western": "中西区", "Eastern": "东区", "Islands": "离岛", "Kowloon City": "九龙城", "Kwai Tsing": "葵青", "Kwun Tong": "观塘", "North": "北区", "Sai Kung": "西贡", "Sha Tin": "沙田", "Sham Shui Po": "深水埗", "Southern": "南区", "Tai Po": "大埔", "Tsuen Wan": "荃湾", "Tuen Mun": "屯门", "Wan Chai": "湾仔", "Wong Tai Sin": "黄大仙", "Yau Tsim Mong": "油尖旺", "Yuen Long": "元朗", } ( Map(init_opts=opts.InitOpts(width="1400px", height="800px")) .add_js_funcs("echarts.registerMap('HK', {});".format(data)) .add( series_name="香港18区人口密度", maptype="HK", data_pair=map_data, name_map=name_map_data, ) .set_global_opts( title_opts=opts.TitleOpts( title="香港18区人口密度（2011）", subtitle="人口密度数据来自Wikipedia", subtitle_link="http://zh.wikipedia.org/wiki/%E9%A6%99%E6%B8%AF%E8%A1%8C%E6%94%BF%E5%8D%80%E5%8A%83" "#cite_note-12 ", ), tooltip_opts=opts.TooltipOpts( trigger="item", formatter="{b}<br/>{c} (p / km2)" ), visualmap_opts=opts.VisualMapOpts( min_=800, max_=50000, range_text=["High", "Low"], is_calculable=True, range_color=["lightskyblue", "yellow", "orangered"], ), ) .render("population_density_of_HongKong.html") )

是应该放在前面

chfw · 2019-05-07T06:54:36Z

pyecharts/charts/basic_charts/bmap.py

@@ -18,7 +19,7 @@ def __init__(self, init_opts: Union[opts.InitOpts, dict] = opts.InitOpts()):
        self.js_dependencies.add("bmap")
        self._is_geo_chart = True
        self._coordinate_system: Optional[str] = "bmap"
-        self.js_bmap_functions: utils.OrderedSet = utils.OrderedSet()
+        self.js_functions: utils.OrderedSet = utils.OrderedSet()


this reveal a problem in our unit test :). should have caught it!

chfw · 2019-05-07T06:55:08Z

pyecharts/charts/basic_charts/geo.py

@@ -178,15 +180,6 @@ def add_schema(
        emphasis_itemstyle_opts: Union[opts.ItemStyleOpts, dict, None] = None,
        emphasis_label_opts: Union[opts.LabelOpts, dict, None] = None,
    ):
-        if isinstance(label_opts, opts.LabelOpts):


chfw · 2019-05-07T06:56:12Z

test/test_sunburst.py

 from unittest.mock import patch

+from nose.tools import eq_


没看懂什么意思？

在这个文件，用到了吗？

已经被移除

chfw · 2019-05-07T07:22:37Z

example/bmap_example.py

+    c = (
+        BMap()
+        .add_schema(
+            baidu_ak="Uf1rIjuIVVXxDwEy0iEU0tApwdoqGeGn",


this api key should not be inserted here! because it is real and belongs to you.

get this from an evironment variable

set API_KEY='.d.d.d.d.d'

in code,

import os
...
baidu_ak=os.environ['API_KEY']
..

这个建议不错

chenjiandongx · 2019-05-07T16:24:51Z

@chfw @sunhailin-Leo 请 Rivew PR，有问题的话请提出。这个 PR 积累的内容已经有点多了，不想再扩展了，需要合并

chfw · 2019-05-07T17:13:02Z

pyecharts/charts/composite_charts/grid.py

-            title=self.options.get("title", opts.TitleOpts().opts) + title
-        )
+        if isinstance(title, opts.TitleOpts):
+            title = title.opts


TitleOpts inherits from BaseOpts?

这个情况特殊只能在这里判断

chfw · 2019-05-07T17:13:39Z

pyecharts/options/series_options.py

 from ..globals import BMapType


 class BasicOpts:
-    pass
+    __slots__ = ("opts",)


hohoho, sexy slots!

concise, but powerful

chfw · 2019-05-07T17:15:14Z

test/test_bar.py

@@ -1,5 +1,7 @@
 from unittest.mock import patch

+from nose.tools import assert_in, assert_not_in, eq_


learnt assert_in and assert_not_in, I did not know their existence before!

chfw · 2019-05-07T17:16:59Z

test/test_timeline.py

 from nose.tools import eq_

 from pyecharts import options as opts
 from pyecharts.charts import Bar, Timeline


-class TestTimeLine:
+class TestTimeLine(unittest.TestCase):


这个好像，有没有无所谓。unittest.TestCase 有一个函数 assetMultilineEqual ，倒是很有用。

nose 会好好测试。

加上去会好一点

chfw

再改改。

chfw

Good to go!

chfw · 2019-05-07T20:13:57Z

@sunhailin-Leo , 还有意见吗？

sunhailin-Leo · 2019-05-08T00:06:30Z

@sunhailin-Leo , 还有意见吗？

👌

chenjiandongx added 6 commits May 6, 2019 22:07

Format: code

0bc21aa

Remove: #coding=utf-8

f240d18

Add: 新增示例以及数据 json 文件

d22646d

Update: 移除 List 使用 Sequence 代替，移除 instance 判断

2670a9b

Update: 修复 Geo Lines 线条丢失的问题

ecec823

Remove: 移除 Mark* data 类型判断

0b15b7e

sunhailin-Leo reviewed May 7, 2019

View reviewed changes

chfw reviewed May 7, 2019

View reviewed changes

chenjiandongx added 5 commits May 7, 2019 21:30

Update: js_functions/bmap_js_funtions 分开处理

2eb9df9

Update: 解决 Grid 图 title 不为 List 的问题

b60e0b2

Update: self.color 对外暴露

d219e6b

Test: 完善测试

ef1e65d

Update: 更新测试和示例

a3482cd

chenjiandongx requested review from sunhailin-Leo and chfw May 7, 2019 15:15

chenjiandongx added 2 commits May 7, 2019 23:17

Fix: test

e1fb674

Fix: 修复 Grid 不能正常渲染主题以及标题的问题

9a81a9f

chenjiandongx added 2 commits May 8, 2019 00:35

Add: Bar 图新增 gap 参数

f71c721

Add: example

e5ee322

chfw reviewed May 7, 2019

View reviewed changes

chfw requested changes May 7, 2019

View reviewed changes

Update: 百度地图 ak 保存至环境变量中

43817fc

chfw approved these changes May 7, 2019

View reviewed changes

sunhailin-Leo approved these changes May 8, 2019

View reviewed changes

chenjiandongx merged commit b8aad7d into dev May 8, 2019

chenjiandongx deleted the clean-code branch May 8, 2019 01:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean code #1081

Clean code #1081

chenjiandongx commented May 6, 2019

codecov-io commented May 6, 2019 •

edited

Loading

sunhailin-Leo May 7, 2019

chfw May 7, 2019 •

edited

Loading

chfw May 7, 2019

chfw May 7, 2019

chfw May 7, 2019

chenjiandongx May 7, 2019

chfw May 7, 2019

chenjiandongx May 7, 2019

chfw May 7, 2019

chfw May 7, 2019

chenjiandongx May 7, 2019

chenjiandongx commented May 7, 2019

chfw May 7, 2019

chenjiandongx May 7, 2019

chfw May 7, 2019

chenjiandongx May 7, 2019

chfw May 7, 2019

chfw May 7, 2019

chfw May 7, 2019

chenjiandongx May 7, 2019

chfw left a comment

chfw left a comment

chfw commented May 7, 2019

sunhailin-Leo commented May 8, 2019

		@@ -1,5 +1,7 @@
		from unittest.mock import patch

		from nose.tools import assert_in, assert_not_in, eq_

Clean code #1081

Clean code #1081

Conversation

chenjiandongx commented May 6, 2019

codecov-io commented May 6, 2019 • edited Loading

Codecov Report

Choose a reason for hiding this comment

chfw May 7, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chenjiandongx commented May 7, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chfw left a comment

Choose a reason for hiding this comment

chfw left a comment

Choose a reason for hiding this comment

chfw commented May 7, 2019

sunhailin-Leo commented May 8, 2019

codecov-io commented May 6, 2019 •

edited

Loading

chfw May 7, 2019 •

edited

Loading