micrOSDevToolKit 2.8.5__py3-none-any.whl → 2.8.6__py3-none-any.whl

{micrOSDevToolKit-2.8.5.dist-info → micrOSDevToolKit-2.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.8.5
+Version: 2.8.6
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{micrOSDevToolKit-2.8.5.dist-info → micrOSDevToolKit-2.8.6.dist-info}/RECORD

@@ -129,7 +129,7 @@ micrOS/source/urequests.py,sha256=1zVeNtnIExKfsgyXSenG9BNXTzpdqNBJoTi-vsys-Yk,58
 micrOS/source/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 micrOS/source/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 micrOS/source/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-micrOSDevToolKit-2.8.5.data/scripts/devToolKit.py,sha256=CVgEETK2JwWgtEFw_dAZPEfOpAQTYZfTb6810E1j2Hg,10660
+micrOSDevToolKit-2.8.6.data/scripts/devToolKit.py,sha256=CVgEETK2JwWgtEFw_dAZPEfOpAQTYZfTb6810E1j2Hg,10660
 toolkit/DevEnvCompile.py,sha256=H19-60ZpHzP30C-wqR5QTzMDHHpWrTk0Uzh--TZHxvw,12148
 toolkit/DevEnvOTA.py,sha256=OkEtO5cpym-kEgGpE3TQbyZ-nQOzZpGzbFdbgCibe7I,25356
 toolkit/DevEnvUSB.py,sha256=qnMTXupUZPHa3hkT7GSCWfofE1TEM82CAs4X4Hvqgl4,34030
@@ -174,7 +174,7 @@ toolkit/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkit/lib/file_extensions.py,sha256=0DpayBGjKQg7y2ZGJXf5wVPnre_4C5j-7YIViNGvYz4,372
 toolkit/lib/macroScript.py,sha256=Hic98kyOR1Up18T6Lrpnnv_8bkNdocnIbiXdv6R7jrI,13854
 toolkit/lib/micrOSClient.py,sha256=T-s5vYSnMgmYOkpET_P-AIjU-7M6mmx-oALT9dNsOZc,17009
-toolkit/lib/pip_package_installer.py,sha256=QrRygkao90MVDzz3IiMIdbHbRwiSrXcmvoBuMdXmpFI,3539
+toolkit/lib/pip_package_installer.py,sha256=jpC-y1KR72_PJlqyUR6-U5b6l1szVqnIZ4nrSgUsOTM,4262
 toolkit/simulator_lib/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 toolkit/simulator_lib/IO_darwin.py,sha256=f8HOfQKJvniShvjpBe6f4nisr6oJd9SnvxPsbdNIGQk,2336
 toolkit/simulator_lib/camera.py,sha256=BIyj6dF_PoszzTZ3Ea_-gsJ3aly_xGy5NMKeJGVSbFI,1485
@@ -360,8 +360,8 @@ toolkit/workspace/precompiled/urequests.mpy,sha256=piW1W0cQTfcXteBRGLK6G8osBIpD6
 toolkit/workspace/precompiled/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 toolkit/workspace/precompiled/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 toolkit/workspace/precompiled/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-micrOSDevToolKit-2.8.5.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-micrOSDevToolKit-2.8.5.dist-info/METADATA,sha256=2XIvhZ57OqPkUQ6BpIA8Ex3C_w0b2_K3Arh53E7gMD4,52937
-micrOSDevToolKit-2.8.5.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-micrOSDevToolKit-2.8.5.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
-micrOSDevToolKit-2.8.5.dist-info/RECORD,,
+micrOSDevToolKit-2.8.6.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+micrOSDevToolKit-2.8.6.dist-info/METADATA,sha256=gB-_bMWbKAlK2CkEoVZW1kAfV0QD2jacI0-dHSZKjrE,52937
+micrOSDevToolKit-2.8.6.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+micrOSDevToolKit-2.8.6.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
+micrOSDevToolKit-2.8.6.dist-info/RECORD,,

toolkit/lib/pip_package_installer.py

@@ -1,10 +1,11 @@
 import sys
-from sys import executable
 import os
 import subprocess
+import getpass
+USER = getpass.getuser()
 MYPATH = os.path.dirname(__file__)
 USER_DATA_OPT_INST_DONE = os.path.join(MYPATH, '../user_data/.opt_dep_install')
-INTERPRETER = executable
+INTERPRETER = sys.executable
 
 sys.path.append(os.path.join(MYPATH, '../'))
 from DevEnvCompile import Compile
@@ -40,21 +41,38 @@ def list_packages():
     return AVAILABLE_PACKAGES
 
 
+def run_subprocess(cmd_list: list):
+    try:
+        result = subprocess.run(
+            cmd_list,
+            capture_output=True,  # Captures stdout and stderr
+            text=True,  # Decodes output into strings
+            check=True  # Raises CalledProcessError for non-zero exit codes
+        )
+        print(f"Subprocess output: {result.stdout}")
+        return True, result.stdout
+    except subprocess.CalledProcessError as e:
+        print(f"{TerminalColors.Colors.ERR}Subprocess error:{TerminalColors.Colors.NC} {e.stderr}")
+        return False, e.stderr
+
 def install_package(name, additional_pip_param=None):
+    print(f"Install optional dependency (pip): {name}")
     try:
         if additional_pip_param is None:
-            state = subprocess.check_call([INTERPRETER, '-m', 'pip', 'install', name])
+            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', USER, name])
         else:
-            state = subprocess.check_call([INTERPRETER, '-m', 'pip', 'install', name, additional_pip_param])
+            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', USER, name, additional_pip_param])
         if state:
             print(f"{TerminalColors.Colors.OK}[PIP] install {name} OK{TerminalColors.Colors.NC}")
         else:
             print(f"{TerminalColors.Colors.WARN}[PIP] install {name} NOK{TerminalColors.Colors.NC}")
+            # Support brew installed python
+            if "This environment is externally managed" in out:
+                if "brew install" in out:
+                    print(f"Install optional dependency (brew): {name}")
+                    state, out = run_subprocess(["brew", "install", name])
     except subprocess.CalledProcessError as e:
         print(f"{TerminalColors.Colors.ERR}[PIP] error: {e}{TerminalColors.Colors.NC}")
-        if "externally-managed-environment" in str(e) and additional_pip_param is None:
-            print("|- Retry with --break-system-packages parameter")
-            return install_package(name, additional_pip_param='--break-system-packages')
         state = False
     return state