Skip to content

Commit

Permalink
still add support for py2.6, but partially support because of protobu…
Browse files Browse the repository at this point in the history
…f's issue

fix doc formatting issue
  • Loading branch information
wjo1212 committed Nov 23, 2017
1 parent bca5589 commit a7b92a2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
```

**supported platforms**:

- windows
- mac
- linux

#### Supported Python:
- Python 2.7, 3.3, 3.4, 3.5, 3.6, PyPy, PyPy3
- Python 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, PyPy, PyPy3


#### Full Usage list:
Expand All @@ -49,6 +50,7 @@ There're three ways to configure the access key and endpoint and they're priorit


**Priority**

1. Parameters

```shell
Expand Down Expand Up @@ -135,6 +137,7 @@ You could store the content of one parameter into a file and pass it via the com
```

**Parameter Validation**

- Mandatory check: if one mandatory parameter is missed, it will report error with usage info.
- Format of parameter's value will be validated. e.g. 例如int, bool, string list, special data structure.
- for boolean, it support:
Expand Down Expand Up @@ -228,6 +231,7 @@ All the commands support below optional global options:
- get_project
- delete_project
- **copy_project**

- 复制所有源project的logstore, logtail, machine group和index配置等到目标project中.

```shell
Expand Down
8 changes: 7 additions & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
```

**支持平台**:

- windows
- mac
- linux



#### 支持平台
- Python 2.7, 3.3, 3.4, 3.5, 3.6, PyPy, PyPy3
- Python 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, PyPy, PyPy3


#### 完整参数列表
Expand All @@ -49,6 +50,7 @@
有三种方式配置访问秘钥与入口, 优先级如下:

**优先级**

1. 参数

```shell
Expand Down Expand Up @@ -142,12 +144,15 @@ endpoint=cn-hangzhou.log.aliyun.com
```

**参数校验**

- 必填的参数没有填写时会报错, 输出参数列表
- 参数格式本身会进行校验, 例如int, bool, string list, 特定数据结构等
- bool支持的形式有:
- true (大小写不敏感), T, 1
- false (大小写不敏感), F, 0

- 字符串列表支持的形式是:

- ["s1", "s2"]

### 输出
Expand Down Expand Up @@ -237,6 +242,7 @@ def create_logstore(self, project_name, logstore_name, ttl=2, shard_count=30):
- get_project
- delete_project
- **copy_project**

- 复制所有源project的logstore, logtail, machine group和index配置等到目标project中.

```shell
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
'Development Status :: 4 - Beta',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
Expand Down

0 comments on commit a7b92a2

Please sign in to comment.