torizon-templates-utils 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

torizon_templates_utils/errors.py

@@ -11,7 +11,8 @@ class _error_struct:
         self.code = code
         self.message = message
 
-
+# Standard Unix errors. There may be other standard error codes also:
+# https://github.com/kaushalparikh/nuttx/blob/master/include/errno.h
 class Error(Enum):
     ENOCONF = _error_struct(
         1, "Not configured"
@@ -28,6 +29,9 @@ class Error(Enum):
     EABORT = _error_struct(
         170, "Abort"
     )
+    ETASKEXEC = _error_struct(
+        310, "Task execution error"
+    )
     ENOFOUND = _error_struct(
         404, "Not found"
     )

torizon_templates_utils/network.py

@@ -5,7 +5,7 @@ import subprocess
 
 
 def get_host_ip():
-    if 'WSL_DISTRO_NAME' in os.environ:
+    if 'WSL_DISTRO_NAME' in os.environ and os.environ['WSL_DISTRO_NAME'] != '':
         command = ["/mnt/c/Windows/System32/Wbem/WMIC.exe", "NICCONFIG", "WHERE", "IPEnabled=true", "GET", "IPAddress"]
 
         # if inside a container we need to run the command in the host

torizon_templates_utils/tasks.py

@@ -428,7 +428,7 @@ class TaskRunner:
         self.__settings = settings
         self.__debug = debug
         self.__gitlab_ci = False
-        self.__override_env = True
+        self.__override_env = False
         self.__cli_inputs: Dict[str, str] = {}
         self.__can_receive_interactive_input = False
 
@@ -444,7 +444,7 @@ class TaskRunner:
             self.__gitlab_ci = True
 
         if "TASKS_OVERRIDE_ENV" in os.environ:
-            self.__override_env = False
+            self.__override_env = True
 
         if "TASKS_DEBUG" in os.environ:
             self.__debug = True
@@ -563,20 +563,31 @@ class TaskRunner:
                             os.environ["config:tcb_packageName"]
                         ],
                         capture_output=True,
-                        text=True
+                        text=True,
+                        env=os.environ
                     )
 
                     if _p_ret.returncode != 0:
-                        raise RuntimeError(f"Error running torizon-io.xsh: {_p_ret.stderr}")
-
-                    _next = int(_p_ret.stdout.strip()) +1
+                        # Sometimes the error is presented on stdout and not stderr
+                        raise RuntimeError(f"Error running torizon-io.xsh: {_p_ret}")
+
+                    # TODO: Maybe not use this and instead disable colors on the terminal
+                    # Remove ANSI escape sequences. Regex from this thread:
+                    # https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python
+                    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+                    _latest_ver = ansi_escape.sub('', _p_ret.stdout.strip())
+
+                    _latest_ver_number = _latest_ver.rsplit('-', 1)[-1]
+                    _latest_ver_last_number = _latest_ver_number.rsplit('.', 1)[-1]
+                    try:
+                        _next = int(_latest_ver_last_number) +1
+                    except:
+                        raise ValueError(f"Package version should be in one of the following formats: <int>, <string-int>, <major.minor.patch>, or <string-major.minor.patch>. Depending on format, int or patch value will be incremented")
 
                     if self.__debug:
                         print(f"Next package version: {_next}")
 
-                    ret.append(
-                        value.replace("${{command:tcb.getNextPackageVersion}}", f"{_next}")
-                    )
+                    value = value.replace(f"${{command:tcb.getNextPackageVersion}}", f"{_next}")
 
                 elif "tcb.outputTEZIFolder" in value:
                     # load the tcbuild.yaml
@@ -589,7 +600,7 @@ class TaskRunner:
                         except KeyError:
                             raise RuntimeError("Error replacing variable tcb.outputTEZIFolder, make sure the tcbuild.yaml has the output.easy-installer.local property")
 
-                        value = value.replace("${{command:tcb.outputTEZIFolder}}", _tezi_folder)
+                        value = value.replace(f"${{command:tcb.outputTEZIFolder}}", _tezi_folder)
 
                 # for all the items we need to replace ${command:tcb. with ${config:tcb.
                 _pattern = r"(?<=\$\{command:tcb\.).*?(?=\s*})"
@@ -887,14 +898,14 @@ class TaskRunner:
         if _env is not None:
             for env, value in _env.items():
                 if self.__override_env:
-                    __env = self.__parse_envs(env, _task)
-                    if __env:
-                        os.environ[env] = __env
-                else:
                     if env not in os.environ:
                         __env = self.__parse_envs(env, _task)
                         if __env:
                             os.environ[env] = __env
+                else:
+                    __env = self.__parse_envs(env, _task)
+                    if __env:
+                        os.environ[env] = __env
 
         # we need to change the cwd if it's set
         if _cwd is not None:
@@ -913,12 +924,16 @@ class TaskRunner:
             print(f"Parsed Args: {_args}", color=Color.YELLOW)
             print(f"Parsed Command: {_cmd_join}", color=Color.YELLOW)
 
+        # use bash to execute the VSCode tasks commands and scripts, as they
+        # are written and tested in bash. Valid just for commands of shell
+        # type, not process type ones
         _ret = subprocess.run(
             [_cmd, *_args] if not _shell else _cmd_join,
             stdout=None,
             stderr=None,
             env=os.environ,
-            shell=_shell
+            shell=_shell,
+            executable="/bin/bash" if _shell else None
         )
 
         # go back to the last cwd
@@ -927,4 +942,3 @@ class TaskRunner:
         if _ret.returncode != 0:
             print(f"> TASK [{label}] exited with error code [{_ret.returncode}] <", color=Color.RED)
             raise RuntimeError(f"Error running task: {label}")
-

{torizon_templates_utils-0.0.7.dist-info → torizon_templates_utils-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: torizon_templates_utils
-Version: 0.0.7
+Version: 0.0.9
 Summary: Package with utilities for Torizon Templates scripts
 Author-email: Matheus Castello <matheus.castello@toradex.com>
 Project-URL: Homepage, https://github.com/torizon/vscode-torizon-templates

torizon_templates_utils-0.0.9.dist-info/RECORD

@@ -0,0 +1,13 @@
+torizon_templates_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+torizon_templates_utils/animations.py,sha256=RrySPMhlrE6f40BBeLvHEHJPOwOnIsv3rHWNt636lro,1671
+torizon_templates_utils/args.py,sha256=nN1b9Ts2lEYbpAGzaMWpAcmcYIrTUFJHehM_UqvnCWA,2142
+torizon_templates_utils/colors.py,sha256=Y1FZ0HtKvXfLGYTDclsXubtZCQ-epuch5Dgk1DJdjps,1143
+torizon_templates_utils/debug.py,sha256=OfdKSdN1kypuJnV_WcPa9bvonjyDvXvA3QTmc1iKyjw,556
+torizon_templates_utils/errors.py,sha256=Wkk0AeCx0KQW-Qlu_5A6GYaGUkaJU79Mok8lZuZKHjM,1425
+torizon_templates_utils/network.py,sha256=zAy2NVspy_VItGeyPKCBqhd7rsQV0Jv-vJurUOfcXyI,1330
+torizon_templates_utils/tasks.py,sha256=elJcgLghGDMcwgOoaGRoI4N0gy5-vFkJmKcJbvcuK7A,32444
+torizon_templates_utils-0.0.9.dist-info/LICENSE,sha256=9sElQO1hY3ElhihFD_PlS5hXMIuSelsJZpIfjNpxBlQ,1099
+torizon_templates_utils-0.0.9.dist-info/METADATA,sha256=etzYySwO6WIOULO8HBJQMGNCYVh-ZizBf5znI-AQyT8,968
+torizon_templates_utils-0.0.9.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+torizon_templates_utils-0.0.9.dist-info/top_level.txt,sha256=qlOkS1ASF5C-kSfpbiWbVHJFgmQ0RN6iunmLArNt6zc,24
+torizon_templates_utils-0.0.9.dist-info/RECORD,,

{torizon_templates_utils-0.0.7.dist-info → torizon_templates_utils-0.0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

torizon_templates_utils-0.0.7.dist-info/RECORD

@@ -1,13 +0,0 @@
-torizon_templates_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-torizon_templates_utils/animations.py,sha256=RrySPMhlrE6f40BBeLvHEHJPOwOnIsv3rHWNt636lro,1671
-torizon_templates_utils/args.py,sha256=nN1b9Ts2lEYbpAGzaMWpAcmcYIrTUFJHehM_UqvnCWA,2142
-torizon_templates_utils/colors.py,sha256=Y1FZ0HtKvXfLGYTDclsXubtZCQ-epuch5Dgk1DJdjps,1143
-torizon_templates_utils/debug.py,sha256=OfdKSdN1kypuJnV_WcPa9bvonjyDvXvA3QTmc1iKyjw,556
-torizon_templates_utils/errors.py,sha256=rvQjWPkwmOQE56vFywq1yQiiRcl-AL7LRVlpyoYDXvc,1214
-torizon_templates_utils/network.py,sha256=-Bj0GEFNf6Zx5hCqTzCpk4HnxuJIvOqS1_P6vrTPowc,1290
-torizon_templates_utils/tasks.py,sha256=qBszFzfR1umUWgkZvSB_hrORTS2yuByX__ImMWDtkho,31213
-torizon_templates_utils-0.0.7.dist-info/LICENSE,sha256=9sElQO1hY3ElhihFD_PlS5hXMIuSelsJZpIfjNpxBlQ,1099
-torizon_templates_utils-0.0.7.dist-info/METADATA,sha256=FFwNtaqD5vjbPBc-SP1wDF51AK0k65V9zzfThdMfDVc,968
-torizon_templates_utils-0.0.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-torizon_templates_utils-0.0.7.dist-info/top_level.txt,sha256=qlOkS1ASF5C-kSfpbiWbVHJFgmQ0RN6iunmLArNt6zc,24
-torizon_templates_utils-0.0.7.dist-info/RECORD,,