bump version

Author: shinny-limin

README.md

@@ -2,7 +2,7 @@
   <img src ="https://raw.githubusercontent.com/shinnytech/tqsdk-python/master/doc/logo.png"/>
 </p>
 <p align="center">
-    <img src ="https://img.shields.io/badge/version-1.1.0-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/version-1.2.0-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/platform-windows|linux|macos-green.svg"/>
     <img src ="https://img.shields.io/badge/python-3.6+-blue.svg" />
     <img src ="https://img.shields.io/github/license/shinnytech/tqsdk-python.svg?color=orange"/>

doc/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.1.0'
+version = u'1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.1.0'
+release = u'1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/version.rst

@@ -2,6 +2,16 @@
 
 版本变更
 =============================
+1.2.0(2019/11/21)
+
+* 支持同时获取对齐的多合约 K 线 (详见 :py:meth:`~tqsdk.api.TqApi.get_kline_serial` )
+* 修复回测时未将非 TqSim 账号转换为 TqSim 的 bug
+* 修复 wait_update() 填写 deadline 参数并等待超时后向服务器发送大量消息
+* 完善测试用例
+* 完善示例程序
+* 完善文档内容
+
+
 1.1.0(2019/10/15)
 
 * 增加时间类型转换的功能函数

setup.py

@@ -36,7 +36,7 @@ def get_tag(self):
 
 setuptools.setup(
     name='tqsdk',
-    version="1.1.0",
+    version="1.2.0",
     description='TianQin SDK',
     author='TianQin',
     author_email='tianqincn@gmail.com',

tqsdk/__version__.py

@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.2.0'