Skip to content

Commit

Permalink
fix doc compiling error
Browse files Browse the repository at this point in the history
  • Loading branch information
laiqiang.dlq committed Nov 17, 2017
1 parent e6a7b04 commit dfb7517
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
[README in English](https://github.com/aliyun/aliyun-log-python-sdk/blob/master/README.md)


## 基本介绍
## 基本介绍

这是Log Service SDK for Python的开源版本。Log Service SDK for Python是阿里云日志服务
(Log Service)API的Python编程接口,提供了对于Log Service Rest API所有接口的封装
和支持,帮助Python开发人员更快编程使用阿里云Log Service服务。

### 具体功能
### 具体功能

1. 封装Rest API。
2. 实现API请求的数字签名
Expand All @@ -25,7 +25,7 @@
6. 使用异常统一处理错误
7. 提供消费组高级API

### 支持Python版本
### 支持Python版本

1. Python 2.6
2. Python 2.7
Expand All @@ -37,7 +37,7 @@
8. Pypy3


### 支持API版本
### 支持API版本

1. Log Service API 0.6

Expand Down
9 changes: 7 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#
import os
import sys
import six
sys.path.insert(0, os.path.abspath('../..'))


Expand Down Expand Up @@ -184,5 +185,9 @@
]

import pypandoc
open("README.rst", "w").write(pypandoc.convert('../../README.md', 'rst'))
open("README_EN.rst", "w").write(pypandoc.convert('../../README_EN.md', 'rst'))
if six.PY3:
open("README.rst", "w").write(pypandoc.convert('../../README.md', 'rst'))
open("README_EN.rst", "w").write(pypandoc.convert('../../README_EN.md', 'rst'))
else:
open("README.rst", "w").write(pypandoc.convert('../../README.md', 'rst').encode('utf8'))
open("README_EN.rst", "w").write(pypandoc.convert('../../README_EN.md', 'rst').encode('utf8'))
3 changes: 2 additions & 1 deletion requirements-py2-doc.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
sphinxcontrib-github
pypandoc
pypandoc
six

0 comments on commit dfb7517

Please sign in to comment.