Update Version 3.4.1

shinnytech · Apr 24, 2023 · 4393c9f · 4393c9f
1 parent 48c48f6
commit 4393c9f
Show file tree

Hide file tree

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

diff --git a/doc/conf.py b/doc/conf.py
@@ -40,17 +40,17 @@
 
 # General information about the project.
 project = u'TianQin Python SDK'
-copyright = u'2018-2022, TianQin'
+copyright = u'2018-2023, TianQin'
 author = u'TianQin'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'3.4.0'
+version = u'3.4.1'
 # The full version, including alpha/beta/rc tags.
-release = u'3.4.0'
+release = u'3.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/version.rst b/doc/version.rst
@@ -2,6 +2,11 @@
 
 版本变更
 =============================
+3.4.1 (2023/04/24)
+
+* 修复: 回测时，部分情况下 expired 字段错误
+
+
 3.4.0 (2023/04/13)
 
 * 增加：支持国密连接，可以在 :py:meth:`~tqsdk.TqAccount` 构造时指定 sm 参数为 True 来启用.

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name='tqsdk',
-    version="3.4.0",
+    version="3.4.1",
     description='TianQin SDK',
     author='TianQin',
     author_email='[email protected]',

diff --git a/tqsdk/__version__.py b/tqsdk/__version__.py
@@ -1 +1 @@
-__version__ = '3.4.0'
+__version__ = '3.4.1'
diff --git a/tqsdk/backtest/backtest.py b/tqsdk/backtest/backtest.py
@@ -268,7 +268,7 @@ async def _send_snapshot(self):
                     "min_market_order_volume": quote["min_market_order_volume"],
                     "underlying_symbol": quote["underlying_symbol"],
                     "strike_price": quote["strike_price"],
-                    "expired": quote.get('expire_datetime', float('nan')) <= self._trading_day_start,  # expired 默认值就是 False
+                    "expired": quote.get('expire_datetime', float('nan')) * 1000000000 <= self._trading_day_start,  # expired 默认值就是 False
                     "trading_time": {"day": trading_time.get("day", []), "night": trading_time.get("night", [])},
                     "expire_datetime": quote.get("expire_datetime"),
                     "delivery_month": quote.get("delivery_month"),
@@ -321,7 +321,7 @@ async def _send_diff(self):
                         "quotes": self._stock_dividend._get_dividend(self._data.get('quotes'), self._trading_day)
                     })
                     self._diffs.append({
-                        "quotes": {k: {'expired': v.get('expire_datetime', float('nan')) <= self._trading_day_start}
+                        "quotes": {k: {'expired': v.get('expire_datetime', float('nan')) * 1000000000 <= self._trading_day_start}
                                    for k, v in self._data.get('quotes').items()}
                     })