siat 3.7.28__py3-none-any.whl → 3.8.1__py3-none-any.whl

siat/__init__.py

@@ -19,17 +19,39 @@ current_version=pkg_resources.get_distribution("siat").version
 #==============================================================================
 # 处理stooq.py修复问题
 restart=False
+tagfile='fix_package.pkl'
+
+#判断操作系统
+import sys; czxt=sys.platform
+if czxt in ['win32','win64']:
+    os='windows'
+elif czxt in ['darwin']: #MacOSX
+    os='mac'
+elif czxt in ['linux']: #linux
+    os='linux'
+else:
+    os='windows'
+
+# 确定标记文件存放地址
+import pandas
+srcpath=pandas.__path__[0]
+if os == 'windows':
+    srcpath1=srcpath.replace("\\",'/')
+    srcfile=srcpath1+'/'+tagfile
+else:
+    srcpath1=srcpath
+    srcfile=srcpath1+'/'+file
+
 try:
-    with open('fix_package.pkl','rb') as file:
+    with open(srcfile,'rb') as file:
         siat_ver=pickle.load(file)
         if siat_ver != current_version:
             restart=True
-            with open('fix_package.pkl','wb') as file:
+            with open(srcfile,'wb') as file:
                 pickle.dump(current_version,file)
-            
 except:
     restart=True
-    with open('fix_package.pkl','wb') as file:
+    with open(srcfile,'wb') as file:
         pickle.dump(current_version,file)
 
 #屏蔽函数内print信息输出的类
@@ -48,6 +70,6 @@ if not restart:
 else:
     with HiddenPrints():
         fix_package()
-    print("Please RESTART Python kernel and run this command again after installed or upgraded siat")
+    print("Please RESTART Python kernel and run this command again")
 
 #==============================================================================

siat/allin.py

@@ -25,6 +25,8 @@ from siat.cryptocurrency import *
 
 # 宏观经济
 from siat.economy import *
+from siat.economy2 import *
+
 
 # ESG
 from siat.esg import *

siat/common.py

@@ -3371,16 +3371,34 @@ def start_end_preprocess(start,end='today'):
         fromdate=date_adjust2(todate,adjust_year=-2,to_prev_month_end=True)  
     elif start in ['l3y']:  # 近三年以来
         fromdate=date_adjust2(todate,adjust_year=-3,to_prev_month_end=True)  
+    elif start in ['l4y']:  # 近三年以来
+        fromdate=date_adjust2(todate,adjust_year=-4,to_prev_month_end=True)  
+        
     elif start in ['l5y']:  # 近五年以来
         fromdate=date_adjust2(todate,adjust_year=-5,to_prev_year_end=True)  
+    elif start in ['l6y']:  # 近五年以来
+        fromdate=date_adjust2(todate,adjust_year=-6,to_prev_year_end=True)  
+    elif start in ['l7y']:  # 近五年以来
+        fromdate=date_adjust2(todate,adjust_year=-7,to_prev_year_end=True)  
+        
     elif start in ['l8y']:  # 近八年以来
         fromdate=date_adjust2(todate,adjust_year=-8,to_prev_year_end=True)   
     elif start in ['l10y']:  # 近十年以来
         fromdate=date_adjust2(todate,adjust_year=-10,to_prev_year_end=True)  
     elif start in ['l20y']:  # 近20年以来
         fromdate=date_adjust2(todate,adjust_year=-20,to_prev_year_end=True)  
+    elif start in ['l15y']:  # 近五年以来
+        fromdate=date_adjust2(todate,adjust_year=-15,to_prev_year_end=True)  
+    elif start in ['l25y']:  # 近五年以来
+        fromdate=date_adjust2(todate,adjust_year=-25,to_prev_year_end=True)  
+        
     elif start in ['l30y']:  # 近30年以来
-        fromdate=date_adjust2(todate,adjust_year=-30,to_prev_year_end=True)           
+        fromdate=date_adjust2(todate,adjust_year=-30,to_prev_year_end=True)   
+    elif start in ['l40y']:  # 近五年以来
+        fromdate=date_adjust2(todate,adjust_year=-40,to_prev_year_end=True)  
+    elif start in ['l50y']:  # 近五年以来
+        fromdate=date_adjust2(todate,adjust_year=-50,to_prev_year_end=True)  
+        
     elif start in ['ytd']:  # 今年以来
         fromdate=str(todaydt.year-1)+'-12-31'        
     else: