Skip to content

Commit

Permalink
Merge pull request pyecharts#695 from pyecharts/dev
Browse files Browse the repository at this point in the history
Dev -> Master -> Release V0.5.9
  • Loading branch information
chenjiandongx authored Aug 26, 2018
2 parents c793459 + 2d06077 commit d22bafd
Show file tree
Hide file tree
Showing 84 changed files with 1,154 additions and 839 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ notifications:
on_success: always # default: change
on_failure: always # default: always
python:
- 3.6
- 3.5
- 3.4
- 2.7
- "3.7-dev"
- "3.6"
- "3.5"
- "3.4"
- "2.7"
before_install:
- pip install -r test/requirements.txt
script:
Expand Down
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,19 @@
<a href="https://badge.fury.io/py/pyecharts">
<img src="https://badge.fury.io/py/pyecharts.svg" alt="Package version">
</a>
<a href="https://github.com/pyecharts/pyecharts/pulls">
<a href="https://pypi.org/project/pyecharts/">
<img src="https://img.shields.io/pypi/pyversions/pyecharts.svg?colorB=brightgreen" alt="PyPI - Python Version">
</a>
</p>
<p align="center">
<a href="https://pypi.org/project/pyecharts">
<img src="https://img.shields.io/pypi/format/pyecharts.svg" alt="PyPI - Format">
</a>
<a href="https://github.com/pyecharts/pyecharts/pulls">
<img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="Contributions welcome">
</a>
<a href="https://opensource.org/licenses/MIT">
<img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License">
<img src="https://img.shields.io/badge/License-MIT-brightgreen.svg" alt="License">
</a>
</p>

Expand Down Expand Up @@ -210,7 +218,7 @@ The project is developed with [Travis CI](https://travis-ci.org/) and [AppVeyor]

## Author

[![chenjiandongx](https://user-images.githubusercontent.com/19553554/35315207-02ea37ea-0106-11e8-9f9f-8fb26922c492.png)](https://github.com/chenjiandongx) [![chfw](https://user-images.githubusercontent.com/19553554/35315208-032a38a4-0106-11e8-85f1-7f601330027f.png)](https://github.com/chfw) [![kinegratii](https://user-images.githubusercontent.com/19553554/35315209-0368f8fa-0106-11e8-99f6-c71d7624a2c9.png)](https://github.com/kinegratii)
[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/0)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/0)[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/1)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/1)[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/2)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/2)[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/3)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/3)[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/4)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/4)[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/5)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/5)[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/6)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/6)[![](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/images/7)](https://sourcerer.io/fame/chenjiandongx/pyecharts/pyecharts/links/7)

## License
pyecharts is released under the MIT License. See LICENSE for more information.
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ environment:
PYTHON_VERSION: "3.5"
- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6"
- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7"

install:
- "%PYTHON%\\python.exe -m pip install -r requirements.txt"
Expand Down
16 changes: 16 additions & 0 deletions docs/en-us/for_pyechart_developer.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Developer's Guide

## Get started


```
$ git clone https://github.com/pyecharts/pyecharts.git
$ pip install -r requirements.txt
$ python setup.py install
```

## Auto code formatting (python 3.6+)

```bash
$ pip install -r requirements-dev.txt
$ ./format_code.sh # windows: format_code.bat
```

## Pull request instructions

`dev` branch is for the development of each new releases. `master` branch is reserved for released code only. What it means for contributors is:
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
autoHeader: true,
loadSidebar: true,
loadNavbar: true,
subMaxLevel: 2,
subMaxLevel: 3,
auto2top: true,
homepage: 'zh-cn/README.md',
search: {
Expand Down
4 changes: 3 additions & 1 deletion docs/zh-cn/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# pyecharts 文档

[![Build Status](https://travis-ci.org/pyecharts/pyecharts.svg?branch=master)](https://travis-ci.org/pyecharts/pyecharts) [![Build status](https://ci.appveyor.com/api/projects/status/81cbsfjpfryv1cl8?svg=true)](https://ci.appveyor.com/project/chenjiandongx/pyecharts) [![codecov](https://codecov.io/gh/pyecharts/pyecharts/branch/master/graph/badge.svg)](https://codecov.io/gh/pyecharts/pyecharts) [![PyPI version](https://badge.fury.io/py/pyecharts.svg)](https://badge.fury.io/py/pyecharts) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/pyecharts/pyecharts/pulls) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
[![Build Status](https://travis-ci.org/pyecharts/pyecharts.svg?branch=master)](https://travis-ci.org/pyecharts/pyecharts) [![Build status](https://ci.appveyor.com/api/projects/status/81cbsfjpfryv1cl8?svg=true)](https://ci.appveyor.com/project/chenjiandongx/pyecharts) [![codecov](https://codecov.io/gh/pyecharts/pyecharts/branch/master/graph/badge.svg)](https://codecov.io/gh/pyecharts/pyecharts) [![PyPI version](https://badge.fury.io/py/pyecharts.svg)](https://badge.fury.io/py/pyecharts) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pyecharts.svg?colorB=brightgreen)](https://pypi.org/project/pyecharts/)
[![PyPI - Format](https://img.shields.io/pypi/format/pyecharts.svg)](https://pypi.org/project/pyecharts)
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/pyecharts/pyecharts/pulls) [![License: MIT](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)


pyecharts 是一个用于生成 Echarts 图表的类库。Echarts 是百度开源的一个数据可视化 JS 库。用 Echarts 生成的图可视化效果非常棒,pyecharts 是为了与 Python 进行对接,方便在 Python 中直接使用数据生成图。
Expand Down
20 changes: 17 additions & 3 deletions docs/zh-cn/changelog.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
# 版本日志

* ### version 0.5.9(dev)
* TODO
* ### version 0.5.10
* Todo


* ### version 0.5.8 - 2018.8.13(current)
* ### version 0.5.9 - 2018.8.26(current)

#### Added
* [pr#685](https://github.com/pyecharts/pyecharts/pull/685) 图表方法(`use_theme`/`config`/`add`)支持链式调用
* [pr#690](https://github.com/pyecharts/pyecharts/pull/690) Radar 新增 `set_radar_component` 方法,废弃 `config` 方法;Parallel 图新增 `set_schema` 方法,废弃 `confg` 方法
* [issue#687](https://github.com/pyecharts/pyecharts/issues/687) 新增 `add_coordinate_json` 方法用于支持导入 Geo/Geolines 坐标数据
* [issue#691](https://github.com/pyecharts/pyecharts/issues/691) 为每种图形新增 `is_animation` 初始化参数,用于控制是否显示动画。
* 新增 [geo-region-coords](https://github.com/pyecharts/geo-region-coords) 辅助项目,提供中国地区坐标查询。

### Updated
* [issue#678](https://github.com/pyecharts/pyecharts/issues/678)`extra_html_text_label` 默认位置移动到图形顶部。
* [pr#677](https://github.com/pyecharts/pyecharts/pull/677) 重构 Polar,更正错误参数。


* ### version 0.5.8 - 2018.8.13

#### Added
* [issue#655](https://github.com/pyecharts/pyecharts/issues/655) 新增多个自定义主题:westeros, wonderland, chalk, halloween, essos,walden, romantic and purple-passion
Expand Down
Loading

0 comments on commit d22bafd

Please sign in to comment.