Merge pull request #105 from qiniu/develop

Release 6.1.5

Author: longbai

.travis.yml

@@ -4,11 +4,16 @@ python:
   - "2.7"
 install:
   - "pip install coverage --use-mirrors"
+  - "pip install pep8 --use-mirrors"
+  - "pip install pyflakes --use-mirrors"
 before_script:
+  - "pep8 --max-line-length=160 ."
+  - "pyflakes ."
   - export QINIU_ACCESS_KEY="X0XpjFmLMTJpHB_ESHjeolCtipk-1U3Ok7LVTdoN"
   - export QINIU_SECRET_KEY="wenlwkU1AYwNBf7Q9cCoG4VT_GYyrHE9AS_R2u81"
   - export QINIU_TEST_BUCKET="pysdk"
   - export QINIU_TEST_DOMAIN="pysdk.qiniudn.com"
+  - export QINIU_TEST_ENV="travis"
   - export PYTHONPATH="$PYTHONPATH:."
 script:
   - python setup.py nosetests

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## CHANGE LOG
 
+### v6.1.5
+
+2014-04-28 issue [#105](https://github.com/qiniu/python-sdk/pull/105)
+- [#100] 遵循PEP8语法规范
+- [#101] 增加pyflakes语法检测
+- [#103] 错误信息中加入Reqid信息，以便追溯
+- [#104] 完善User-Agent头信息，以便追溯
+- [#98] 增加fetch、prefetch、pfop三个接口的范例代码
+
 ### v6.1.4
 
 2014-03-28 issue [#95](https://github.com/qiniu/python-sdk/pull/95)

README.md

@@ -1,14 +1,35 @@
 Qiniu Resource Storage SDK for Python
 ===
 
-[![Build Status](https://api.travis-ci.org/qiniu/python-sdk.png?branch=develop)](https://travis-ci.org/qiniu/python-sdk)
+[![Build Status](https://api.travis-ci.org/qiniu/python-sdk.png?branch=master)](https://travis-ci.org/qiniu/python-sdk)
 
-[![Qiniu Logo](http://qiniutek.com/images/logo-2.png)](http://qiniu.com/)
+[![Qiniu Logo](http://qiniu-brand.qiniudn.com/5/logo-white-195x105.png)](http://www.qiniu.com/)
 
 ## 使用
 
 参考文档：[七牛云存储 Python SDK 使用指南](https://github.com/qiniu/python-sdk/blob/develop/docs/README.md)
 
+## 准备开发环境
+
+### 安装
+
+* 直接安装:
+
+    pip install qiniu  
+    或  
+    easy_install qiniu  
+
+Python-SDK可以使用`pip`或`easy_install`从PyPI服务器上安装，但不包括文档和样例。如果需要，请下载源码并安装。
+
+* 源码安装：
+
+从[release](https://github.com/qiniu/python-sdk/releases)下载源码：
+
+    tar xvzf python-sdk-$VERSION.tar.gz
+    cd python-sdk-$VERSION
+    python setup.py install
+
+
 ## 单元测试
 
 1. 测试环境
@@ -36,7 +57,7 @@ Qiniu Resource Storage SDK for Python
 
 ## 许可证
 
-Copyright (c) 2013 qiniu.com
+Copyright (c) 2012-2014 qiniu.com
 
 基于 MIT 协议发布: