Merge pull request #239 from ee0703/master

kirk更改为compute并更新changelog

Author: longbai

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+## 7.1.0 (2016-12-08)
+### 增加
+* 通用计算支持
+
 ## 7.0.10 (2016-11-29)
 ### 修正
 * 去掉homedir

manual_test_kirk.py

@@ -10,13 +10,13 @@
 import logging
 import pytest
 from qiniu import auth
-from qiniu.services import kirk
+from qiniu.services import compute
 
 
 access_key = os.getenv('QINIU_ACCESS_KEY')
 secret_key = os.getenv('QINIU_SECRET_KEY')
 qn_auth = auth.QiniuMacAuth(access_key, secret_key)
-acc_client = kirk.app.AccountClient(qn_auth)
+acc_client = compute.app.AccountClient(qn_auth)
 qcos_client = None
 user_name = ''
 app_uri = ''
@@ -25,7 +25,7 @@
 
 
 def setup_module(module):
-    acc_client = kirk.app.AccountClient(qn_auth)
+    acc_client = compute.app.AccountClient(qn_auth)
     user_info = acc_client.get_account_info()[0]
     acc_client.create_app({'name': app_name, 'title': 'whatever', 'region': app_region})
 

qiniu/__init__.py

@@ -9,7 +9,7 @@
 
 # flake8: noqa
 
-__version__ = '7.0.10'
+__version__ = '7.1.0'
 
 from .auth import Auth, QiniuMacAuth
 
@@ -20,6 +20,7 @@
 from .services.storage.uploader import put_data, put_file, put_stream
 from .services.processing.pfop import PersistentFop
 from .services.processing.cmd import build_op, pipe_cmd, op_save
-from .services.kirk.app import AccountClient
+from .services.compute.app import AccountClient
+from .services.compute.qcos_api import QcosClient
 
 from .utils import urlsafe_base64_encode, urlsafe_base64_decode, etag, entry