idf-build-apps 2.5.0rc0__py3-none-any.whl → 2.5.0rc1__py3-none-any.whl

idf_build_apps/__init__.py

@@ -8,7 +8,7 @@ Tools for building ESP-IDF related apps.
 # ruff: noqa: E402
 # avoid circular imports
 
-__version__ = '2.5.0rc0'
+__version__ = '2.5.0rc1'
 
 from .session_args import (
     SessionArgs,

idf_build_apps/app.py

@@ -74,7 +74,6 @@ class App(BaseModel):
     NAME_PLACEHOLDER: t.ClassVar[str] = '@n'  # replace it with self.name
     FULL_NAME_PLACEHOLDER: t.ClassVar[str] = '@f'  # replace it with escaped self.app_dir
     IDF_VERSION_PLACEHOLDER: t.ClassVar[str] = '@v'  # replace it with the IDF version
-    PARALLEL_INDEX_PLACEHOLDER: t.ClassVar[str] = '@p'  # replace it with the parallel index
     INDEX_PLACEHOLDER: t.ClassVar[str] = '@i'  # replace it with the build index (while build_apps)
 
     SDKCONFIG_LINE_REGEX: t.ClassVar[t.Pattern] = re.compile(r'^([^=]+)=\"?([^\"\n]*)\"?\n*$')
@@ -115,7 +114,6 @@ class App(BaseModel):
     copy_sdkconfig: bool = False
 
     # build_apps() related
-    parallel_index: t.Optional[int] = None  # used for expand
     index: t.Optional[int] = None
 
     # build status related
@@ -244,8 +242,6 @@ class App(BaseModel):
 
         if self.index is not None:
             path = path.replace(self.INDEX_PLACEHOLDER, str(self.index))
-        if self.parallel_index:
-            path = path.replace(self.PARALLEL_INDEX_PLACEHOLDER, str(self.parallel_index))
         path = path.replace(
             self.IDF_VERSION_PLACEHOLDER, f'{IDF_VERSION_MAJOR}_{IDF_VERSION_MINOR}_{IDF_VERSION_PATCH}'
         )

idf_build_apps/args.py

@@ -760,22 +760,24 @@ class BuildArguments(FindBuildArguments):
         default=None,
         metadata=asdict(
             FieldMetadata(
-                description='[INTERNAL CI USE] record size json filepath of the built apps to the specified file. '
+                description='Record size json filepath of the built apps to the specified file. '
                 'Each line is a json string. Can expand placeholders @p',
             )
         ),
     )
+    _collect_size_info: t.Optional[str] = field(init=False, repr=False, default=None)
     collect_app_info: t.Optional[str] = field(
         default=None,
         metadata=asdict(
             FieldMetadata(
-                description='[INTERNAL CI USE] record serialized app model of the built apps to the specified file. '
+                description='Record serialized app model of the built apps to the specified file. '
                 'Each line is a json string. Can expand placeholders @p',
             )
         ),
     )
+    _collect_app_info: t.Optional[str] = field(init=False, repr=False, default=None)
     ignore_warning_str: InitVar[t.Optional[t.List[str]]] = _Field.UNSET
-    ignore_warning_strings: t.Optional[t.List[str]] = field(
+    ignore_warning_strs: t.Optional[t.List[str]] = field(
         default=None,
         metadata=asdict(
             FieldMetadata(
@@ -816,6 +818,10 @@ class BuildArguments(FindBuildArguments):
             )
         ),
     )
+    _junitxml: t.Optional[str] = field(init=False, repr=False, default=None)
+
+    # used for expanding placeholders
+    PARALLEL_INDEX_PLACEHOLDER: t.ClassVar[str] = '@p'  # replace it with the parallel index
 
     def __post_init__(  # type: ignore
         self,
@@ -841,20 +847,71 @@ class BuildArguments(FindBuildArguments):
             config_rules_str=config_rules_str,
         )
 
-        self.set_deprecated_field('ignore_warning_strings', 'ignore_warning_str', ignore_warning_str)
+        self.set_deprecated_field('ignore_warning_strs', 'ignore_warning_str', ignore_warning_str)
         self.set_deprecated_field('ignore_warning_files', 'ignore_warning_file', ignore_warning_file)
 
-        self.ignore_warning_strings = to_list(self.ignore_warning_strings) or []
+        self.ignore_warning_strs = to_list(self.ignore_warning_strs) or []
 
         ignore_warnings_regexes = []
-        if self.ignore_warning_strings:
-            for s in self.ignore_warning_strings:
+        if self.ignore_warning_strs:
+            for s in self.ignore_warning_strs:
                 ignore_warnings_regexes.append(re.compile(s))
         if self.ignore_warning_files:
             for s in self.ignore_warning_files:
                 ignore_warnings_regexes.append(re.compile(s.strip()))
         App.IGNORE_WARNS_REGEXES = ignore_warnings_regexes
 
+        if not isinstance(BuildArguments.collect_size_info, property):
+            self._collect_size_info = self.collect_size_info
+            BuildArguments.collect_size_info = property(  # type: ignore
+                BuildArguments._get_collect_size_info,
+                BuildArguments._set_collect_size_info,
+            )
+
+        if not isinstance(BuildArguments.collect_app_info, property):
+            self._collect_app_info = self.collect_app_info
+            BuildArguments.collect_app_info = property(  # type: ignore
+                BuildArguments._get_collect_app_info,
+                BuildArguments._set_collect_app_info,
+            )
+
+        if not isinstance(BuildArguments.junitxml, property):
+            self._junitxml = self.junitxml
+            BuildArguments.junitxml = property(  # type: ignore
+                BuildArguments._get_junitxml,
+                BuildArguments._set_junitxml,
+            )
+
+    def _get_collect_size_info(self) -> t.Optional[str]:
+        return (
+            self._collect_size_info.replace(self.PARALLEL_INDEX_PLACEHOLDER, str(self.parallel_index))
+            if self._collect_size_info
+            else None
+        )
+
+    def _set_collect_size_info(self, k: str) -> None:
+        self._collect_size_info = k
+
+    def _get_collect_app_info(self) -> t.Optional[str]:
+        return (
+            self._collect_app_info.replace(self.PARALLEL_INDEX_PLACEHOLDER, str(self.parallel_index))
+            if self._collect_app_info
+            else None
+        )
+
+    def _set_collect_app_info(self, k: str) -> None:
+        self._collect_app_info = k
+
+    def _get_junitxml(self) -> t.Optional[str]:
+        return (
+            self._junitxml.replace(self.PARALLEL_INDEX_PLACEHOLDER, str(self.parallel_index))
+            if self._junitxml
+            else None
+        )
+
+    def _set_junitxml(self, k: str) -> None:
+        self._junitxml = k
+
 
 @dataclass
 class DumpManifestShaArguments(GlobalArguments):

idf_build_apps/main.py

@@ -125,9 +125,6 @@ def build_apps(
     start, stop = get_parallel_start_stop(len(apps), build_arguments.parallel_count, build_arguments.parallel_index)
     LOGGER.info('Total %s apps. running build for app %s-%s', len(apps), start, stop)
 
-    for app in apps[start - 1 : stop]:  # we use 1-based
-        app.parallel_index = build_arguments.parallel_index
-
     # cleanup collect files if exists at this early-stage
     for f in (build_arguments.collect_app_info, build_arguments.collect_size_info, build_arguments.junitxml):
         if f and os.path.isfile(f):

{idf_build_apps-2.5.0rc0.dist-info → idf_build_apps-2.5.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: idf-build-apps
-Version: 2.5.0rc0
+Version: 2.5.0rc1
 Summary: Tools for building ESP-IDF related apps.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=3.7

{idf_build_apps-2.5.0rc0.dist-info → idf_build_apps-2.5.0rc1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-idf_build_apps/__init__.py,sha256=RPw7wTPPVr_WwSjWSYSAAdmKxRoFeZfkmvSrEE8cLcQ,653
+idf_build_apps/__init__.py,sha256=lNmiLMTMLPCSsopP2KyWGdNwChp4yCUJflvK8NqTVlE,653
 idf_build_apps/__main__.py,sha256=8E-5xHm2MlRun0L88XJleNh5U50dpE0Q1nK5KqomA7I,182
-idf_build_apps/app.py,sha256=T4quqTJ1F40QyAfr5aNZcPpvRBJOfc10hXCk1RMG8fo,37637
-idf_build_apps/args.py,sha256=VSnLDwFmgSNDzldzqdw0frd6gmCwhsd6ri76V296x00,35757
+idf_build_apps/app.py,sha256=F-MKOsaz7cJ0H2wsEE4gpO4kkkEdkyFmIZBHDoM2qgs,37359
+idf_build_apps/args.py,sha256=n15pTDm2Xuq5R39JVjOwICiHlLdLjisLUItYahWVRsk,37983
 idf_build_apps/autocompletions.py,sha256=g-bx0pzXoFKI0VQqftkHyGVWN6MLjuFOdozeuAf45yo,2138
 idf_build_apps/config.py,sha256=TvJ-puAhR7r7SYdAWsK5XdOTAVuw5k8xiqO2jRms_ZA,3586
 idf_build_apps/constants.py,sha256=mOHb74qX8WsA4sm-NoSFpLy4HzjIsc-ApUN6XGtrXXM,3904
 idf_build_apps/finder.py,sha256=evkHtNIhCB3wgCMGPxOC34v-_B4mtZ1VBiZ14IRVuFw,5727
 idf_build_apps/log.py,sha256=pyvT7N4MWzGjIXph5mThQCGBiSt53RNPW0WrFfLr0Kw,2650
-idf_build_apps/main.py,sha256=xw6lmVmAKD1f7aHb5c7qQbAfqmHfh_t_q57Q_z6htLs,15331
+idf_build_apps/main.py,sha256=HYkUkgTFJmsbW01_yBFOMd1iZorzVL1LVKHK90B9zok,15213
 idf_build_apps/session_args.py,sha256=2WDTy40IFAc0KQ57HaeBcYj_k10eUXRKkDOWLrFCaHY,2985
 idf_build_apps/utils.py,sha256=Cibdr7oHhcnl9uxJNfPLksp2nfPCPW0efAwDhX4dTmw,10099
 idf_build_apps/junit/__init__.py,sha256=IxvdaS6eSXp7kZxRuXqyZyGxuA_A1nOW1jF1HMi8Gns,231
@@ -19,8 +19,8 @@ idf_build_apps/manifest/manifest.py,sha256=c9ooxNe3SOEndsVtJ-xxJNWPF6YlS-LpX_5wm
 idf_build_apps/manifest/soc_header.py,sha256=PzJ37xFspt5f0AXWvAFNA_avHZA9fMXHBrwDYLi3qEI,4344
 idf_build_apps/yaml/__init__.py,sha256=W-3z5no07RQ6eYKGyOAPA8Z2CLiMPob8DD91I4URjrA,162
 idf_build_apps/yaml/parser.py,sha256=Y2OyB4g1DCC7C7jrvpIyZV9lgeCB_XvuB75iGmqiTaM,2093
-idf_build_apps-2.5.0rc0.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
-idf_build_apps-2.5.0rc0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-idf_build_apps-2.5.0rc0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-idf_build_apps-2.5.0rc0.dist-info/METADATA,sha256=ghIKlVQjTRflEhKdnQW8LC_bSYhdYuxlIfzN153oR8c,4580
-idf_build_apps-2.5.0rc0.dist-info/RECORD,,
+idf_build_apps-2.5.0rc1.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
+idf_build_apps-2.5.0rc1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+idf_build_apps-2.5.0rc1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+idf_build_apps-2.5.0rc1.dist-info/METADATA,sha256=hMh9EC42dcm2mV0Qmq2Vz2TXu-8pZbGxDs2RksriOII,4580
+idf_build_apps-2.5.0rc1.dist-info/RECORD,,