修复导包错误

DjangoAppCenter/cli.py

@@ -1,36 +1,16 @@
 import os
-import re
 import sys
 
 import fire
 
 from DjangoAppCenter.settings.loader import init_profile, CWD_SETTINGS_PATH
 from DjangoAppCenter.settings.loader import load_settings_from_file
+from DjangoAppCenter.utils import get_python_version
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 sys.path.append(os.path.abspath(os.getcwd()))
 
 
-def get_python_version():
-    import subprocess
-    p = subprocess.Popen(['python', '--version'],
-                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    stdout, stderr = p.communicate()
-
-    # 为了兼容 python 2.x 中 python --version 输出到 stderr 的bug
-    # https://bugs.python.org/issue18338
-    stdout = stderr if not stdout else stdout
-
-    version = re.findall(r'([0-9]+)\.([0-9]+)\.([0-9\+]+)', str(stdout))[0]
-
-    import platform
-    if (not platform.system() == 'Windows') and version[0] == '2':
-        return 'python3'
-
-    return 'python'
-
-
 def dev():
     """run django in debug mode"""
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'DjangoAppCenter.settings')

DjangoAppCenter/packages/models.py

@@ -6,7 +6,7 @@
 
 from DjangoAppCenter.extensions.fields.snowflake import SnowFlakeField
 from DjangoAppCenter.settings.loader import merge_profile
-from cli import get_python_version
+from DjangoAppCenter.utils import get_python_version
 
 logger = logging.getLogger("admin")
 

DjangoAppCenter/utils.py

@@ -0,0 +1,21 @@
+import re
+
+
+def get_python_version():
+    import subprocess
+    p = subprocess.Popen(['python', '--version'],
+                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+    stdout, stderr = p.communicate()
+
+    # 为了兼容 python 2.x 中 python --version 输出到 stderr 的bug
+    # https://bugs.python.org/issue18338
+    stdout = stderr if not stdout else stdout
+
+    version = re.findall(r'([0-9]+)\.([0-9]+)\.([0-9\+]+)', str(stdout))[0]
+
+    import platform
+    if (not platform.system() == 'Windows') and version[0] == '2':
+        return 'python3'
+
+    return 'python'