siat 3.7.3__py3-none-any.whl → 3.7.4__py3-none-any.whl

siat/common.py

@@ -3836,6 +3836,8 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
     或python -m pip install --upgrade pip
     如果上述方法不适用，您可能需要重新安装Python，并确保在安装过程中选中了“Add Python to PATH”
     """
+    DEBUG=False
+    
     print("Upgrading siat and related modules, please wait ... ...")
     
     #获取系统目录
@@ -3865,7 +3867,8 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
         if sp_list[-1] == 'anaconda3': break
     
     #生成pip命令字符串前半段，仅缺插件名
-    cmdstr=sp+sep_flag+'Scripts'+sep_flag+pipcmd+' '
+    #cmdstr=sp+sep_flag+'Scripts'+sep_flag+pipcmd+' '
+    cmdstr=sp+sep_flag+pipcmd+' '
     
     #检查是否使用镜像源
     if alternative == "":
@@ -3898,17 +3901,25 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
     for m in tqdm(module_list):
         #print("Upgrading",m,"... ...",end='')
         #print_progress_percent2(m,module_list,steps=5,leading_blanks=2)
+        if DEBUG:
+            print("  DEBUG: m={}".format(m))
         
         if alternative == "":
             cmdstr1=cmdstr+m
         else:
             cmdstr1=cmdstr+m+' '+alter_source
-        #print(cmdstr1)
+        if DEBUG:
+            print("  DEBUG: cmdstr1={}".format(cmdstr1))
         
         #proc=subprocess.run(cmdstr1.split(' '),stdout=subprocess.PIPE)
-        proc=subprocess.run(cmdstr1.split(' '))
-        rcode=proc.returncode
-        if rcode !=0: fail_list=fail_list+[m]
+        try:
+            proc=subprocess.run(cmdstr1.split(' '))
+            rcode=proc.returncode
+            if rcode !=0: fail_list=fail_list+[m]
+        except:
+            print("  #Error(upgrade_siat): executable file python not found in {}".format(sp))
+            print("  Solution: find out the exact path where the executable file python locates")
+            return
     
     if len(fail_list) == 0:
         print("All specified modules are successfully upgraded!")
@@ -3918,7 +3929,7 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
         
         if 'pip' in fail_list:
             print("Upgrading for pip, in Anaconda Prompt (Windows) or Terminal (Mac):")
-            print("  python -m pip install --upgrade pip")
+            print("  python -m pip install --upgrade --user pip")
         
     return
 

{siat-3.7.3.dist-info → siat-3.7.4.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=-ZYYp1HK7SkfTR3vBKZ0QVC4Q_tbST2O4MGbX_V77J0,32031
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=Ed89feCX9c7i_hbd_pcDk8h7Ie-VHOVKITSH4cKA02M,162842
+siat/common.py,sha256=2Y51NN6n4FhkNXDRFnV9xPE2Z7XcjqcqaWtZLRaDmgQ,163283
 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
@@ -141,8 +141,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=r0Q67cSMMlfebEkI9h9pdGlJCooEq7hw_3M5IUs4cSI,20081
-siat-3.7.3.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.3.dist-info/METADATA,sha256=CTwHox9UQtS4g3RRebTz5dH5GgC62g4WOxJr8mr1tEo,8009
-siat-3.7.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-siat-3.7.3.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.3.dist-info/RECORD,,
+siat-3.7.4.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.4.dist-info/METADATA,sha256=Z5_tRV4Qco5cFw7n0OY1MUd17AVse6nzSrziWnY9PMI,8009
+siat-3.7.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.7.4.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.4.dist-info/RECORD,,

{siat-3.7.3.dist-info → siat-3.7.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any