Skip to content

Commit

Permalink
Merge pull request pyecharts#575 from pyecharts/dev
Browse files Browse the repository at this point in the history
Dev -> Master -> Release version 0.5.5
  • Loading branch information
chenjiandongx authored May 17, 2018
2 parents 8817713 + 07c2aa8 commit 29a2ca9
Show file tree
Hide file tree
Showing 25 changed files with 938 additions and 518 deletions.
16 changes: 15 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
<!--
### 提 issue 注意事项
0. 先仔细阅读文档中是否有关于您需要解决的问题的解决方法
1. 提 issue 前请先搜搜看以往的 issue 有没有解决了您的问题
2. 如若是不能正常使用的问题,请贴上详细的 pyecharts 版本,使用系统以及 Python 版本
3. 最好详细描述问题,必要时加上**代码+贴图**
3. 最好详细描述问题,必要时加上**代码+贴图**
-->

**问题**



**运行环境(系统环境及 pyecharts 版本)**



**代码及截图**


10 changes: 9 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<!--
### 提 PR 注意事项
0. 同步到 dev 分支的最新版本
1. 代码尽量保持与项目统一风格,尽量按照 PEP8 规范写代码,必要时附上注释
2. 如需要时请添加单元测试,也请确保所有测试能够通过
3. 将 PR 推送至远程的 dev 分支,master 分支只负责发布新版本。请在提交信息中描述关于该 PR 的详细信息,需要时加上截图。
4. 若是对文档进行修改,请确保数字,字母与中文之间两边均有一空格,如你所看到的整篇文档一样
4. 若是对文档进行修改,请确保数字,字母与中文之间两边均有一空格,如你所看到的所有文档一样
-->

本次 PR 内容,


14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ So please see installation instruction and other usage at that repository.

pyecharts exposes chart API and template API so that it can work on other python frameworks.

### Integration with Jupyter Notebook
### Integration with Jupyter Notebook/nteract

In the Notebook cell, you can simply pass on chart instance itself to Jupyter, which will diplay the chart. Please note **render_notebook** function has been removed.

Expand All @@ -126,6 +126,18 @@ In the case of online jshost mode, you can also download as some file formats (i

![](https://user-images.githubusercontent.com/19553554/35104252-3e36cee2-fca3-11e7-8e43-09bbe8dbbd1e.png)

#### nteract

Since pyecharts 0.5.5+, [nteract](https://nteract.io) is supported. Once the following two lines should added to your notebook, you could use pyecharts in nteract in the same way as in jupyter notebook.

```
from pyecharts import enable_nteract
enable_nteract()
```

However, when rendering output as image, the instructions are the same as jupyter notebook. Only default html(including js) output should call `enable_nteract()`.

### Integrate With Web Framework

With the help of pyecharts API, it is easy to integrate pyecharts to your web projects, such as Flask and Django.
Expand Down
2 changes: 1 addition & 1 deletion docs/zh-cn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pyecharts 是一个用于生成 Echarts 图表的类库。Echarts 是百度开

**平台支持**

[Jupyter Notebook](zh-cn/jupyter_notebook) | [Flask](zh-cn/flask) | [Django](zh-cn/django) | [web 框架整合](zh-cn/web_integration)
[Jupyter Notebook/nteract](zh-cn/jupyter_notebook) | [Flask](zh-cn/flask) | [Django](zh-cn/django) | [web 框架整合](zh-cn/web_integration)

**其他资源**

Expand Down
15 changes: 12 additions & 3 deletions docs/zh-cn/changelog.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
# 版本日志

* ### version 0.5.5(dev)
* ### version 0.5.6(dev)
* TODO

* ### version 0.5.4 - 2018.05.15(current)
* ### version 0.5.5 - 2018.05.17(current)

### Added
* [issue#565](https://github.com/pyecharts/pyecharts/issues/565) Geolines 图数据项可以新增数值维度
* [issue#573](https://github.com/pyecharts/pyecharts/issues/573) 新增对 jupyter notebook 家族的新成员 [nteract](https://nteract.io/) 的支持

### Fixed
* [issue#572](https://github.com/pyecharts/pyecharts/issues/572) 修复 HeatMap 图纵坐标显示索引值,而非 data 值的 bug

* ### version 0.5.4 - 2018.05.15

### Updated
* 重构 `Page` 类,新增图表命名名称引用。

### Fixed
* [issue#555](https://github.com/pyecharts/pyecharts/issues/555) 修复 v0.5.3 Polar 图不能显示的 bug
* [issue#541](https://github.com/pyecharts/pyecharts/issues/541) 修复 v0.5.3 Django + pyecharts 不能正常导入的 bug

* ### version 0.5.3 - 2018.05.10

#### Fixed
Expand Down
Loading

0 comments on commit 29a2ca9

Please sign in to comment.