siat 3.0.20__py3-none-any.whl → 3.0.25__py3-none-any.whl

siat/common.py

@@ -3755,35 +3755,60 @@ def df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2,
     return
 
 #==============================================================================
-def upgrade_siat():
+if __name__=='__main__':
+    upgrade_siat()
+
+def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
+                              'yfinance','yahooquery','urllib3','twine'], \
+                 pipcmd="pip install --upgrade"):
     """
     功能：一次性升级siat及其相关插件
     
-    注意：在Spyder中可用，但在Jupyter中不能用，可能是路径问题!
+    注意：pip的路径问题!
     """
-    #系统路径
+    print("  Try upgrading siat and related modules, please wait ... ...")
+    #获取系统目录
     import sys
-    python_dir=sys.path
+    syspath=sys.path
+    
+    #判断目录分隔符号
+    win_sep='\\'; win_flag=False
+    mac_sep='//'; mac_flag=False
+    
+    sp_list=syspath[0].split(win_sep)
+    if len(sp_list) > 1:
+        win_flag=True
+        
+    sp_list=syspath[0].split(mac_sep)
+    if len(sp_list) > 1:
+        win_flag=True   
     
-    #插件列表
-    pip_list=['siat','akshare','pandas','pandas_datareader','yfinance','yahooquery']
-    pip_cmd='pip install --upgrade '
+    if win_flag:
+        sep_flag=win_sep
+    else:
+        sep_flag=mac_sep
+    
+    #寻找anaconda3的安装目录
+    for sp in syspath:
+        sp_list=sp.split(sep_flag)
+        if sp_list[-1] == 'anaconda3': break
+    
+    #生成pip命令字符串前半段，仅缺插件名
+    cmdstr=sp+sep_flag+'Scripts'+sep_flag+pipcmd+' '
     
+    #逐个升级插件
     import subprocess
-    for p in pip_list:
-        print("  Upgrading",p,"\b, please wait ... ...")
-        command = pip_cmd + p
-        #result = subprocess.run(command, shell=True, text=True, capture_output=True)
-        result = subprocess.run(command.split(' '), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-         
-        if result.returncode == 0:
-            print('    Successfully upgraded', p)
-        else:
-            print('      Upgrade failed:', result.returncode)
-            print('      Error message:', result.stderr)        
+    for m in module_list:
+        cmdstr1=cmdstr+m
+        #print(cmdstr1)
+        #proc=subprocess.run(cmdstr1.split(' '),stdout=subprocess.PIPE)
+        proc=subprocess.run(cmdstr1.split(' '))
+        rcode=proc.returncode
+        if rcode==0: result='successfully upgraded:-)'
+        else: result='failed to upgrade, try alternative method:-('
+        print("    Module:",m,'\b,',result)
     
     return
-
 #==============================================================================
 #==============================================================================
 #==============================================================================

{siat-3.0.20.dist-info → siat-3.0.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.0.20
+Version: 3.0.25
 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.0.20.dist-info → siat-3.0.25.dist-info}/RECORD

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=hta-X1iWPjNbG1YYIVlQF-YvKA8An3KuEyLmUEZ3hH8,25562
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=egDH2ihlNYMC8hAMQq2JRrJH8_52VenHTYeMBPnVJdI,139936
+siat/common.py,sha256=s9itecI3JgX5dfrodiFHKcjs5HsOihAMVW8yaETlHMQ,140584
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -132,7 +132,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=Tde2LzPDQy3Z7xOQQDw4ckQMPdROp_z0-GjFE6Z5_lI,67639
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.0.20.dist-info/METADATA,sha256=ovHOM235JnIy97atHOdoHLFImQgA_5mlE0OP_8dEGZk,1448
-siat-3.0.20.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.0.20.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.0.20.dist-info/RECORD,,
+siat-3.0.25.dist-info/METADATA,sha256=AiUF8-PiZRMcVtJ3k7R-oCgYu9C5Hg1wE5WTNxOZ1qk,1448
+siat-3.0.25.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.0.25.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.25.dist-info/RECORD,,