Bladeren bron

pip 설치 관련 수정

잉여개발기 (SPDV) 2 jaren geleden
bovenliggende
commit
1dd5d132d9
8 gewijzigde bestanden met toevoegingen van 17 en 26 verwijderingen
  1. 2 1
      app.py
  2. 1 0
      emergency_tool.py
  3. 2 0
      requirements.txt
  4. 2 0
      route/api_skin_info.py
  5. 3 0
      route/edit.py
  6. 3 0
      route/main_sys_update.py
  7. 3 24
      route/tool/func.py
  8. 1 1
      version.json

+ 2 - 1
app.py

@@ -1,7 +1,8 @@
 # Init
 import os
 import re
-import ctypes
+import logging
+import shutil
 
 from route.tool.func import *
 from route import *

+ 1 - 0
emergency_tool.py

@@ -4,6 +4,7 @@ import os
 import platform
 import urllib
 import zipfile
+import urllib.request
 
 from route.tool.func import *
 

+ 2 - 0
requirements.txt

@@ -1,3 +1,5 @@
+pip
+
 flask
 waitress
 

+ 2 - 0
route/api_skin_info.py

@@ -1,3 +1,5 @@
+import urllib.request
+
 from .tool.func import *
 
 def api_skin_info(name = ''):

+ 3 - 0
route/edit.py

@@ -1,5 +1,8 @@
+import multiprocessing
+
 from .tool.func import *
 
+
 def edit_render_set(name, content):
     render_set(
         doc_name = name,

+ 3 - 0
route/main_sys_update.py

@@ -1,3 +1,6 @@
+import zipfile
+import urllib.request
+
 from .tool.func import *
 
 def main_sys_update():

+ 3 - 24
route/tool/func.py

@@ -4,20 +4,14 @@ import sys
 import platform
 import json
 import smtplib
-import zipfile
-import shutil
-import logging
 import random
-import typing
 import ipaddress
-import multiprocessing
+import subprocess
 
 import email.mime.text
 import email.utils
 import email.header
 
-import urllib.request
-
 # Init-Version
 with open('version.json', encoding = 'utf8') as file_data:
     version_list = json.loads(file_data.read())
@@ -41,25 +35,10 @@ if data_up_date == 1:
         f.write(version_list['beta']['r_ver'])
     
     if platform.system() in ('Linux', 'Windows'):
-        if platform.python_implementation() == 'PyPy':
-            os.system(
-                'pypy' + ('3' if platform.system() != 'Windows' else '') + ' ' + \
-                '-m pip install --upgrade --user -r requirements.txt'
-            )
-        else:
-            os.system(
-                'python' + ('3' if platform.system() != 'Windows' else '') + ' ' + \
-                '-m pip install --upgrade --user -r requirements.txt'
-            )
-        
-        print('----')
-        try:
-            os.execl(sys.executable, sys.executable, *sys.argv)
-        except:
-            pass
+        subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade", "--user", "-r", "requirements.txt"])
 
         try:
-            os.execl(sys.executable, '"' + sys.executable + '"', *sys.argv)
+            os.execl(sys.executable, os.path.abspath(__file__), *sys.argv)
         except:
             print('Error : restart failed')
             raise

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev203",
+        "r_ver" : "v3.4.6-RC3-dev206",
         "c_ver" : "3500361",
         "s_ver" : "3500111"
     }