Skip to content

Commit 0a6b40a

Browse files
shinny-packshinny-chenli
authored andcommitted
Update Version 3.7.0
1 parent 5cc39d4 commit 0a6b40a

File tree

9 files changed

+23
-7
lines changed

9 files changed

+23
-7
lines changed

PKG-INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: tqsdk
3-
Version: 3.6.1
3+
Version: 3.7.0
44
Summary: TianQin SDK
55
Home-page: https://www.shinnytech.com/tqsdk
66
Author: TianQin

doc/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
# built documents.
4949
#
5050
# The short X.Y version.
51-
version = u'3.6.1'
51+
version = u'3.7.0'
5252
# The full version, including alpha/beta/rc tags.
53-
release = u'3.6.1'
53+
release = u'3.7.0'
5454

5555
# The language for content autogenerated by Sphinx. Refer to documentation
5656
# for a list of supported languages.

doc/reference/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ TqSdk 模块参考
1111
tqsdk.account.rst
1212
tqsdk.tqkq.rst
1313
tqsdk.tqzq.rst
14+
tqsdk.tqctp.rst
1415
tqsdk.sim.rst
1516
tqsdk.multiaccount.rst
1617
tqsdk.objs.rst

doc/reference/tqsdk.tqctp.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.. _tqsdk.tqctp:
2+
3+
tqsdk.TqCtp - 直连 CTP 交易类
4+
------------------------------------------------------------------
5+
.. autoclass:: tqsdk.TqCtp
6+
:members:
7+
:inherited-members:

doc/version.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
版本变更
44
=============================
5+
3.7.0 (2024/08/22)
6+
7+
* 新增::py:class:`~tqsdk.TqCtp` 账户类型,支持直连 CTP 柜台
8+
9+
510
3.6.1 (2024/08/16)
611

712
* 优化:仅在发送过订阅请求后,才会发送退订请求

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
setuptools.setup(
1010
name='tqsdk',
11-
version="3.6.1",
11+
version="3.7.0",
1212
description='TianQin SDK',
1313
author='TianQin',
1414
author_email='[email protected]',
@@ -18,7 +18,7 @@
1818
packages=setuptools.find_packages(exclude=["tqsdk.test", "tqsdk.test.*"]),
1919
python_requires='>=3.6.4',
2020
install_requires=["websockets>=8.1", "requests", "numpy", "pandas>=1.1.0", "scipy", "simplejson", "aiohttp",
21-
"certifi", "pyjwt", "psutil", "shinny_structlog", "sgqlc", "filelock", "tqsdk_ctpse", "tqsdk_sm", "tqsdk_zq_otg==1.0.1"],
21+
"certifi", "pyjwt", "psutil", "shinny_structlog", "sgqlc", "filelock", "tqsdk_ctpse", "tqsdk_sm", "tqsdk_zq_otg==1.1.0"],
2222
classifiers=[
2323
"Programming Language :: Python :: 3",
2424
"License :: OSI Approved :: Apache Software License",

tqsdk/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '3.6.1'
1+
__version__ = '3.7.0'

tqsdk/api.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,8 @@ def get_kline_serial(self, symbol: Union[str, List[str]], duration_seconds: int,
619619
620620
chart_id (str): [Deprecated] 由 api 自动生成,此参数不再使用
621621
622+
**获取后的 kline 对象请不要修改/重命名原始的 kline 序列,可能会导致后续的 kline 数据不更新 **
623+
622624
**注:关于传入合约代码列表 获取多合约K线的说明:**
623625
624626
1. 主合约的字段名为原始K线数据字段,从第一个副合约开始,字段名在原始字段后加数字,如第一个副合约的开盘价为 "open1" , 第二个副合约的收盘价为 "close2"。

tqsdk/zq_otg.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import json
77
import os
88
import tempfile
9+
import signal
910
import sys
1011
import subprocess
1112
import contextlib
@@ -62,7 +63,7 @@ async def get_addr(self):
6263
async def __aexit__(self, exc_type, exc, tb):
6364
if self._zq_otg_proc is not None:
6465
with contextlib.suppress(ProcessLookupError):
65-
self._zq_otg_proc.terminate()
66+
self._zq_otg_proc.send_signal(signal.CTRL_BREAK_EVENT if sys.platform.startswith("win") else signal.SIGTERM)
6667
if sys.platform.startswith("win"):
6768
self._zq_otg_proc.wait()
6869
else:

0 commit comments

Comments
 (0)