ryry-cli 2.1__tar.gz → 2.2__tar.gz

{ryry_cli-2.1/ryry_cli.egg-info → ryry_cli-2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.1
+Version: 2.2
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

ryry_cli-2.2/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.2"
+app_bulld_number=22
+app_bulld_anchor="Noh_2024-05-24 16:53:57.779807"
+app_name="ryry-cli"

{ryry_cli-2.1 → ryry_cli-2.2}/ryry/ryry_widget.py

@@ -41,12 +41,17 @@ def compare_versions(version1, version2):
 
 def _remote_package_version(py_package):
     remote_version = ""
-    result = subprocess.run(f"pip index versions {py_package} -i https://pypi.python.org/simple/", 
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    ss = result.stdout.decode(encoding="utf8", errors="ignore").split("\n")
-    for s in ss:
-        if "LATEST:" in s.strip():
-            remote_version = s.replace("LATEST:", "").strip()
+    for pip in ["pip3","pip"]:
+        result = subprocess.run(f"pip index versions {py_package} -i https://pypi.python.org/simple/", 
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        ss = result.stdout.decode(encoding="utf8", errors="ignore").split("\n")
+        for s in ss:
+            if "LATEST:" in s.strip():
+                remote_version = s.replace("LATEST:", "").strip()
+                break
+        else:
+            continue
+        break
     return remote_version
 
 #real time version get
@@ -55,15 +60,20 @@ def _local_package_version(py_package):
     if platform.system() == 'Windows':
         find_str = "findstr"
     local_version = ""
-    result = subprocess.run(f"pip list | {find_str} {py_package}", 
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    ss = result.stdout.decode(encoding="utf8", errors="ignore").split("\n")
-    for s in ss:
-        s = re.sub(r'\s+', ' ', s)
-        sl = s.strip().split(" ")
-        if len(sl) == 2:
-            if py_package.strip() == sl[0].strip():
-                local_version = sl[1].strip()
+    for pip in ["pip3","pip"]:
+        result = subprocess.run(f"{pip} list | {find_str} {py_package}", 
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        ss = result.stdout.decode(encoding="utf8", errors="ignore").split("\n")
+        for s in ss:
+            s = re.sub(r'\s+', ' ', s)
+            sl = s.strip().split(" ")
+            if len(sl) == 2:
+                if py_package.strip() == sl[0].strip():
+                    local_version = sl[1].strip()
+                    break
+        else:
+            continue
+        break
     return local_version
 
 def _pypi_folder_name(name):
@@ -312,9 +322,11 @@ setuptools.setup(
         subprocess.run(f"python {setup_py} sdist bdist_wheel", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=pip_dir, encoding="utf-8")
         #uninstall
         subprocess.run(f"pip uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
+        subprocess.run(f"pip3 uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
         #install
         whl = utils.firstExitWithDir(os.path.join(pip_dir, "dist"), "whl")
         subprocess.run(f"pip install {whl} --extra-index-url https://pypi.python.org/simple/", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
+        subprocess.run(f"pip3 install {whl} --extra-index-url https://pypi.python.org/simple/", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
         #upload
         ryry_webapi.uploadWidget(widget_id, name, whl, ".whl", local_version)
         print(f"发布 {name}_{local_version} -> 成功")
@@ -365,8 +377,11 @@ def UpdateWidgetFromPypi():
                     if compare_versions(remote_version, local_version) > 0:
                         #update
                         subprocess.run(f"pip uninstall {py_package} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+                        subprocess.run(f"pip3 uninstall {py_package} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
                         subprocess.run(f"pip install {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+                        subprocess.run(f"pip3 install {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
+                            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
                         widgetUpdateNotify(py_package, local_version, remote_version)
                 except Exception as ex:
                     print(ex)
@@ -381,8 +396,11 @@ def installWidget(name):
     if compare_versions(remote_version, local_version) > 0:
         #update
         subprocess.run(f"pip uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        subprocess.run(f"pip3 uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
         subprocess.run(f"pip install {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
             stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        subprocess.run(f"pip3 install {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
         widgetInstallNotify(name, remote_version)
         addWidgetToEnv(name)
         

{ryry_cli-2.1 → ryry_cli-2.2}/ryry/utils.py

@@ -286,7 +286,9 @@ start /B {restart_command}''')
             if update_cli:
                 f.write(f'''#!/bin/bash
 pip uninstall ryry-cli -y 
+pip3 uninstall ryry-cli -y 
 pip install -U ryry-cli -i {simple} --extra-index-url https://pypi.python.org/simple/
+pip3 install -U ryry-cli -i {simple} --extra-index-url https://pypi.python.org/simple/
 nohup {restart_command} &''')
             else:
                 f.write(f'''#!/bin/bash

{ryry_cli-2.1 → ryry_cli-2.2/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.1
+Version: 2.2
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-2.1 → ryry_cli-2.2}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.1"
+ryry_version = "2.2"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")

ryry_cli-2.1/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.1"
-app_bulld_number=21
-app_bulld_anchor="Noh_2024-05-24 16:29:00.913157"
-app_name="ryry-cli"