Update Version 3.4.4

shinnytech · Jul 12, 2023 · bcd03a8 · bcd03a8
1 parent c91522b
commit bcd03a8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 19 deletions.
diff --git a/PKG-INFO b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tqsdk
-Version: 3.4.3
+Version: 3.4.4
 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.4.3'
+version = u'3.4.4'
 # The full version, including alpha/beta/rc tags.
-release = u'3.4.3'
+release = u'3.4.4'
 
 # 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.4 (2023/07/12)
+
+* 修复: 升级 numpy 后，tafunc.barlast 报错的问题
+
+
 3.4.3 (2023/07/06)
 
 * 增加: 支持获取 CSI 指数行情

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

diff --git a/tqsdk/__version__.py b/tqsdk/__version__.py
@@ -1 +1 @@
-__version__ = '3.4.3'
+__version__ = '3.4.4'
diff --git a/tqsdk/api.py b/tqsdk/api.py
@@ -3349,18 +3349,18 @@ def _update_serial_single(self, serial):
                 array[0:serial["width"] - shift] = array[shift:serial["width"]]
                 for ext in serial["extra_array"].values():
                     ext[0:serial["width"] - shift] = ext[shift:serial["width"]]
-                    if np.issubdtype(ext.dtype, np.floating):
+                    if np.issubdtype(ext.dtype, np.timedelta64):
+                        ext[serial["width"] - shift:] = np.timedelta64('nat')
+                    elif np.issubdtype(ext.dtype, np.integer):
+                        ext[serial["width"] - shift:] = 0
+                    elif np.issubdtype(ext.dtype, np.floating):
                         ext[serial["width"] - shift:] = np.nan
                     elif np.issubdtype(ext.dtype, np.object_):
                         ext[serial["width"] - shift:] = None
-                    elif np.issubdtype(ext.dtype, np.integer):
-                        ext[serial["width"] - shift:] = 0
                     elif np.issubdtype(ext.dtype, np.bool_):
                         ext[serial["width"] - shift:] = False
                     elif np.issubdtype(ext.dtype, np.datetime64):
                         ext[serial["width"] - shift:] = np.datetime64('nat')
-                    elif np.issubdtype(ext.dtype, np.timedelta64):
-                        ext[serial["width"] - shift:] = np.timedelta64('nat')
                     else:
                         ext[serial["width"] - shift:] = np.nan
             serial["update_row"] = max(serial["width"] - shift - 1, 0)
@@ -3505,18 +3505,18 @@ def _update_serial_multi(self, serial):
                 remain = max(2 * serial["width"] - 1 - new_data_index, 0)
                 for ext in serial["extra_array"].values():
                     ext[:remain] = ext[serial["width"] - remain:]
-                    if ext.dtype == np.float:
+                    if np.issubdtype(ext.dtype, np.timedelta64):
+                        ext[remain:] = np.timedelta64('nat')
+                    elif np.issubdtype(ext.dtype, np.integer):
+                        ext[remain:] = 0
+                    elif np.issubdtype(ext.dtype, np.floating):
                         ext[remain:] = np.nan
-                    elif ext.dtype == np.object:
+                    elif np.issubdtype(ext.dtype, np.object_):
                         ext[remain:] = None
-                    elif ext.dtype == np.int:
-                        ext[remain:] = 0
-                    elif ext.dtype == np.bool:
+                    elif np.issubdtype(ext.dtype, np.bool_):
                         ext[remain:] = False
-                    elif ext.dtype == np.datetime64:
+                    elif np.issubdtype(ext.dtype, np.datetime64):
                         ext[remain:] = np.datetime64('nat')
-                    elif ext.dtype == np.timedelta64:
-                        ext[remain:] = np.timedelta64('nat')
                     else:
                         ext[remain:] = np.nan
 

diff --git a/tqsdk/tafunc.py b/tqsdk/tafunc.py
@@ -812,7 +812,7 @@ def barlast(cond):
 
     """
     cond = cond.to_numpy()
-    v = np.array(~cond, dtype=np.int)
+    v = np.array(~cond, dtype=int)
     c = np.cumsum(v)
     x = c[cond]
     d = np.diff(np.concatenate(([0], x)))