siat 3.7.28__py3-none-any.whl → 3.7.29__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/sector_china.py

@@ -3480,11 +3480,12 @@ def contains_chinese(text):
 #==============================================================================
 if __name__=='__main__':
     ticker='600791.SS'
+    ticker='689009.SS'
     
     ticker=['600791.SS','东阿阿胶']
     level='1'
     
-    find_industry_sw(ticker)
+    find_industry_sw(ticker,level='1')
     
 def find_industry_sw(ticker,level='1',ticker_order=True,max_sleep=30):
     """
@@ -3621,7 +3622,7 @@ if __name__=='__main__':
     peers=stock_industry_peer_em(ticker,indicator="市盈率",rank=10)
 
 def stock_peers_em(ticker='',indicator='',rank=10, \
-                   force_show_stock=False, \
+                   force_show_stock=True, \
                    font_size="16px",facecolor="papayawhip", \
                    numberPerLine=5):
     """
@@ -3724,7 +3725,7 @@ def stock_peers_em(ticker='',indicator='',rank=10, \
         df_disp=cfg[collist].tail(abs(rank))
     
     #强制显示所选股票
-    if force_show_stock:
+    if force_show_stock and rank != 10:
         #所选股票是否在其中？
         if not ticker[:6] in list(df_disp["代码"]):
             ticker_seq=cfg[cfg["代码"]==ticker[:6]]["序号"].values[0]
@@ -4020,9 +4021,10 @@ def stock_peers_sw(ticker):
                 print("\n #Warning(stock_peers_sw): failed to search peers for",ticker)
                 print("  Possible solutions:")
                 print("  Try first: upgrade akshare, restart Jupyter and try again")
-                print("  If not working, uninstall anaconda and reinstall a newer version")
+                #print("  If not working, uninstall anaconda and reinstall a newer version")
 
     #查找股票在行业板块中的位置
+    ticker_item=''
     if not ilist=='':
         ticker6=ticker[:6]
         for i in ilist:
@@ -4030,12 +4032,12 @@ def stock_peers_sw(ticker):
                 ticker_item=i
                 ticker_pos=ilist.index(i)+1
                 break
-        
-        footnote0="注："
-        footnote1=ticker_item+"在申万行业"+hangye_final+"指数中的权重排名为"+str(ticker_pos)+'/'+str(len(ilist))
-        footnote2="该指数的权重排名依据主要包括公司的市值规模、流动性以及市场代表性"
-        footnote=footnote0+'\n'+footnote1+'\n'+footnote2
-        print(footnote)
+        if ticker_item != '':
+            footnote0="注："
+            footnote1=ticker_item+"在申万行业"+hangye_final+"指数中的权重排名为"+str(ticker_pos)+'/'+str(len(ilist))
+            footnote2="该指数的权重排名依据主要包括公司的市值规模、流动性以及市场代表性"
+            footnote=footnote0+'\n'+footnote1+'\n'+footnote2
+            print(footnote)
     return
         
 #==============================================================================

{siat-3.7.28.dist-info → siat-3.7.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.7.28
+Version: 3.7.29
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University

{siat-3.7.28.dist-info → siat-3.7.29.dist-info}/RECORD

@@ -1,5 +1,5 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/__init__.py,sha256=tX_xClvPr3TZ8t7WlUMFJnceRCQSseGnq1szeRjck8Q,1813
+siat/__init__.py,sha256=N2D1ydfh_lejim0z6eQR17utNF7-5lk04c1esGO71_E,2223
 siat/__init__.py.backup_20250214.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
 siat/allin.py,sha256=x1QC29PUBUYiA6IAbQKbRvtxIEUOBx8dy5k7zh1ABT4,2970
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
@@ -97,7 +97,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=IBuRqA2kppdZsW4D4fapW7vnM5HMEXOn95A5r9Pkwlo,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=L58_8aDPZ54GbIm7-Oxg0pEdQ3hha6pJIah82pYzS8c,155147
+siat/sector_china.py,sha256=cWa5EiSDX7E7w_XCDNOBgxtim474ayYMDfPkVex8fFA,155257
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=dYwvz9H-uWp-Gyc1g_MId9k8cITS6ZHmjW-Fc2ypp-0,26587
@@ -143,8 +143,8 @@ siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.7.28.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.28.dist-info/METADATA,sha256=4kVtKwGVnpVtaWBWbl0PuPiWcclWxuzhtt3ndREUq7o,8321
-siat-3.7.28.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.7.28.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.28.dist-info/RECORD,,
+siat-3.7.29.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.29.dist-info/METADATA,sha256=fOU35G2D0BocknrWdcxbCMUJcVPpHVV9cEyhfK9H1nk,8321
+siat-3.7.29.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.7.29.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.29.dist-info/RECORD,,