Update Version 3.7.0

shinnytech · Aug 23, 2024 · 0a6b40a · 0a6b40a
1 parent 5cc39d4
commit 0a6b40a
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/PKG-INFO b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tqsdk
-Version: 3.6.1
+Version: 3.7.0
 Summary: TianQin SDK
 Home-page: https://www.shinnytech.com/tqsdk
 Author: TianQin

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

diff --git a/doc/reference/index.rst b/doc/reference/index.rst
@@ -11,6 +11,7 @@ TqSdk 模块参考
     tqsdk.account.rst
     tqsdk.tqkq.rst
     tqsdk.tqzq.rst
+    tqsdk.tqctp.rst
     tqsdk.sim.rst
     tqsdk.multiaccount.rst
     tqsdk.objs.rst

diff --git a/doc/reference/tqsdk.tqctp.rst b/doc/reference/tqsdk.tqctp.rst
@@ -0,0 +1,7 @@
+.. _tqsdk.tqctp:
+
+tqsdk.TqCtp - 直连 CTP 交易类
+------------------------------------------------------------------
+.. autoclass:: tqsdk.TqCtp
+    :members:
+    :inherited-members:
diff --git a/doc/version.rst b/doc/version.rst
@@ -2,6 +2,11 @@
 
 版本变更
 =============================
+3.7.0 (2024/08/22)
+
+* 新增：:py:class:`~tqsdk.TqCtp` 账户类型，支持直连 CTP 柜台
+
+
 3.6.1 (2024/08/16)
 
 * 优化：仅在发送过订阅请求后，才会发送退订请求

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name='tqsdk',
-    version="3.6.1",
+    version="3.7.0",
     description='TianQin SDK',
     author='TianQin',
     author_email='[email protected]',
@@ -18,7 +18,7 @@
     packages=setuptools.find_packages(exclude=["tqsdk.test", "tqsdk.test.*"]),
     python_requires='>=3.6.4',
     install_requires=["websockets>=8.1", "requests", "numpy", "pandas>=1.1.0", "scipy", "simplejson", "aiohttp",
-                      "certifi", "pyjwt", "psutil", "shinny_structlog", "sgqlc", "filelock", "tqsdk_ctpse", "tqsdk_sm", "tqsdk_zq_otg==1.0.1"],
+                      "certifi", "pyjwt", "psutil", "shinny_structlog", "sgqlc", "filelock", "tqsdk_ctpse", "tqsdk_sm", "tqsdk_zq_otg==1.1.0"],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: Apache Software License",

diff --git a/tqsdk/__version__.py b/tqsdk/__version__.py
@@ -1 +1 @@
-__version__ = '3.6.1'
+__version__ = '3.7.0'
diff --git a/tqsdk/api.py b/tqsdk/api.py
@@ -619,6 +619,8 @@ def get_kline_serial(self, symbol: Union[str, List[str]], duration_seconds: int,
 
             chart_id (str): [Deprecated] 由 api 自动生成，此参数不再使用
 
+            **获取后的 kline 对象请不要修改/重命名原始的 kline 序列，可能会导致后续的 kline 数据不更新 **
+
             **注：关于传入合约代码列表 获取多合约K线的说明：**
 
             1. 主合约的字段名为原始K线数据字段，从第一个副合约开始，字段名在原始字段后加数字，如第一个副合约的开盘价为 "open1" , 第二个副合约的收盘价为 "close2"。

diff --git a/tqsdk/zq_otg.py b/tqsdk/zq_otg.py
@@ -6,6 +6,7 @@
 import json
 import os
 import tempfile
+import signal
 import sys
 import subprocess
 import contextlib
@@ -62,7 +63,7 @@ async def get_addr(self):
     async def __aexit__(self, exc_type, exc, tb):
         if self._zq_otg_proc is not None:
             with contextlib.suppress(ProcessLookupError):
-                self._zq_otg_proc.terminate()
+                self._zq_otg_proc.send_signal(signal.CTRL_BREAK_EVENT if sys.platform.startswith("win") else signal.SIGTERM)
             if sys.platform.startswith("win"):
                 self._zq_otg_proc.wait()
             else: