idf-build-apps 2.6.2__py3-none-any.whl → 2.6.4__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.6.2'
+__version__ = '2.6.4'
 
 from .session_args import (
     SessionArgs,

idf_build_apps/app.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 
 import copy
@@ -127,6 +127,11 @@ class App(BaseModel):
     __EQ_IGNORE_FIELDS__ = [
         'build_comment',
     ]
+    __EQ_TUNE_FIELDS__ = {
+        'app_dir': lambda x: (os.path.realpath(os.path.expanduser(x))),
+        'work_dir': lambda x: (os.path.realpath(os.path.expanduser(x))),
+        'build_dir': lambda x: (os.path.realpath(os.path.expanduser(x))),
+    }
 
     def __init__(
         self,

idf_build_apps/args.py

@@ -323,19 +323,6 @@ class DependencyDrivenBuildArguments(GlobalArguments):
                 root_path=to_absolute_path(self.manifest_rootpath),
             )
 
-        if self.deactivate_dependency_driven_build_by_components is not None:
-            if self.modified_components is None:
-                raise InvalidCommand(
-                    'Must specify --deactivate-dependency-driven-build-by-components '
-                    'together with --modified-components'
-                )
-
-        if self.deactivate_dependency_driven_build_by_filepatterns is not None:
-            if self.modified_files is None:
-                raise InvalidCommand(
-                    'Must specify --deactivate-dependency-driven-build-by-filepatterns together with --modified-files'
-                )
-
     @property
     def dependency_driven_build_enabled(self) -> bool:
         """
@@ -450,7 +437,7 @@ class FindBuildArguments(DependencyDrivenBuildArguments):
         FieldMetadata(
             deprecates={'size_file': {}},
         ),
-        description='`idf.py size` output file under the build directory when specified. ' 'Can expand placeholders',
+        description='`idf.py size` output file under the build directory when specified. Can expand placeholders',
         validation_alias=AliasChoices('size_json_filename', 'size_file'),
         default=None,  # type: ignore
     )
@@ -654,8 +641,7 @@ class BuildArguments(FindBuildArguments):
             },
             nargs='+',
         ),
-        description='space-separated list of patterns. '
-        'Ignore the warnings in the build output that match the patterns',
+        description='space-separated list of patterns. Ignore the warnings in the build output that match the patterns',
         validation_alias=AliasChoices('ignore_warning_strs', 'ignore_warning_str'),
         default=None,  # type: ignore
     )

idf_build_apps/main.py

@@ -10,6 +10,7 @@ import os
 import sys
 import textwrap
 import typing as t
+from pathlib import Path
 
 import argcomplete
 from pydantic import (
@@ -99,7 +100,7 @@ def find_apps(
     else:
         app_cls = find_arguments.build_system
 
-    apps = []
+    apps: t.Set[App] = set()
     if find_arguments.target == 'all':
         targets = ALL_TARGETS
     else:
@@ -107,7 +108,7 @@ def find_apps(
 
     for _t in targets:
         for _p in find_arguments.paths:
-            apps.extend(
+            apps.update(
                 _find_apps(
                     _p,
                     _t,
@@ -170,6 +171,13 @@ def build_apps(
             LOGGER.debug('Remove existing collect file %s', f)
 
     exit_code = 0
+
+    # create empty files, avoid no file when no app is built
+    if build_arguments.collect_app_info:
+        Path(build_arguments.collect_app_info).touch()
+    if build_arguments.collect_size_info:
+        Path(build_arguments.collect_size_info).touch()
+
     for i, app in enumerate(apps):
         index = i + 1  # we use 1-based
         if index < start or index > stop:

idf_build_apps/utils.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 
 import fnmatch
@@ -340,6 +340,7 @@ class BaseModel(_BaseModel):
     """
 
     __EQ_IGNORE_FIELDS__: t.List[str] = []
+    __EQ_TUNE_FIELDS__: t.Dict[str, t.Callable[[t.Any], t.Any]] = {}
 
     def __lt__(self, other: t.Any) -> bool:
         if isinstance(other, self.__class__):
@@ -350,6 +351,10 @@ class BaseModel(_BaseModel):
                 self_attr = getattr(self, k, '') or ''
                 other_attr = getattr(other, k, '') or ''
 
+                if k in self.__EQ_TUNE_FIELDS__:
+                    self_attr = str(self.__EQ_TUNE_FIELDS__[k](self_attr))
+                    other_attr = str(self.__EQ_TUNE_FIELDS__[k](other_attr))
+
                 if self_attr != other_attr:
                     return self_attr < other_attr
 
@@ -369,13 +374,22 @@ class BaseModel(_BaseModel):
                 self_model_dump.pop(_field, None)
                 other_model_dump.pop(_field, None)
 
+            for _field in self.__EQ_TUNE_FIELDS__:
+                self_model_dump[_field] = self.__EQ_TUNE_FIELDS__[_field](self_model_dump[_field])
+                other_model_dump[_field] = self.__EQ_TUNE_FIELDS__[_field](other_model_dump[_field])
+
             return self_model_dump == other_model_dump
 
         return NotImplemented
 
     def __hash__(self) -> int:
         hash_list = []
-        for v in self.model_dump().values():
+
+        self_model_dump = self.model_dump()
+        for _field in self.__EQ_TUNE_FIELDS__:
+            self_model_dump[_field] = self.__EQ_TUNE_FIELDS__[_field](self_model_dump[_field])
+
+        for v in self_model_dump.values():
             if isinstance(v, list):
                 hash_list.append(tuple(v))
             elif isinstance(v, dict):

{idf_build_apps-2.6.2.dist-info → idf_build_apps-2.6.4.dist-info}/METADATA

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

{idf_build_apps-2.6.2.dist-info → idf_build_apps-2.6.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
-idf_build_apps/__init__.py,sha256=m6Rv6NFbCuro2DEeChOgSIDFGQahhbsPVd6IEqQJY74,650
+idf_build_apps/__init__.py,sha256=4YQAUfHodWwG2N97CUD5qms_PxD1g8JuEWPO4q6vynY,650
 idf_build_apps/__main__.py,sha256=8E-5xHm2MlRun0L88XJleNh5U50dpE0Q1nK5KqomA7I,182
-idf_build_apps/app.py,sha256=F-MKOsaz7cJ0H2wsEE4gpO4kkkEdkyFmIZBHDoM2qgs,37359
-idf_build_apps/args.py,sha256=zB08ctBXFz1UkPv4r7kE6E6sBezCFrrzt99HKRDiRTA,34821
+idf_build_apps/app.py,sha256=v85SiN56-yOxxo48owo9JLgL56sQjsR6c5ScBES4wxA,37611
+idf_build_apps/args.py,sha256=rNOzetQYyfCfz9RQq_bzLXL6FrFpJllvLU2VooL_p9s,34178
 idf_build_apps/autocompletions.py,sha256=g-bx0pzXoFKI0VQqftkHyGVWN6MLjuFOdozeuAf45yo,2138
 idf_build_apps/constants.py,sha256=HU0rtKqhvLj9nMsy6XvyQMjMEBliNi9xaS2D8CQEPsE,2421
 idf_build_apps/finder.py,sha256=hY6uSMB2s65MqMKIDBSHABOfa93mOLT7x5hlMxC43EQ,5794
 idf_build_apps/log.py,sha256=pyvT7N4MWzGjIXph5mThQCGBiSt53RNPW0WrFfLr0Kw,2650
-idf_build_apps/main.py,sha256=SZauvC_DNEsl1Twc5xQxHSSPt8sgYsNOZjN4UjHk0gQ,16569
+idf_build_apps/main.py,sha256=zp1MvX78qlrF2qZ3kqBQAo27Q3b8ZczsGicABdpXID4,16866
 idf_build_apps/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 idf_build_apps/session_args.py,sha256=2WDTy40IFAc0KQ57HaeBcYj_k10eUXRKkDOWLrFCaHY,2985
-idf_build_apps/utils.py,sha256=s4D8P7QA17XcaCUQ_EoiNOW_VpU3cPQgiZVV9KQ8I30,10171
+idf_build_apps/utils.py,sha256=cQJ5N-53vrASa4d8WW0AQCPJzendArXyU3kB5Vx-AH8,10880
 idf_build_apps/junit/__init__.py,sha256=IxvdaS6eSXp7kZxRuXqyZyGxuA_A1nOW1jF1HMi8Gns,231
 idf_build_apps/junit/report.py,sha256=T7dVU3Sz5tqjfbcFW7wjsb65PDH6C2HFf73ePJqBhMs,6555
 idf_build_apps/junit/utils.py,sha256=NXZxQD4tdbSVKjKMNx1kO2H3IoEiysXkDoDjLEf1RO8,1303
@@ -20,8 +20,8 @@ idf_build_apps/vendors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 idf_build_apps/vendors/pydantic_sources.py,sha256=cxSIPRc3eI5peVMhDxwf58YaGhuG4SCwPRVX2znFEek,4553
 idf_build_apps/yaml/__init__.py,sha256=W-3z5no07RQ6eYKGyOAPA8Z2CLiMPob8DD91I4URjrA,162
 idf_build_apps/yaml/parser.py,sha256=b3LvogO6do-eJPRsYzT-8xk8AT2MnXpLCzQutJqyC7M,2128
-idf_build_apps-2.6.2.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
-idf_build_apps-2.6.2.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-idf_build_apps-2.6.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-idf_build_apps-2.6.2.dist-info/METADATA,sha256=mKkCtbqE575AjE9JLBbTUeRQ9Cs1gcep0FHeHl0tN8s,4693
-idf_build_apps-2.6.2.dist-info/RECORD,,
+idf_build_apps-2.6.4.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
+idf_build_apps-2.6.4.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+idf_build_apps-2.6.4.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+idf_build_apps-2.6.4.dist-info/METADATA,sha256=jlNXdbm6ZA-m4j-vCpm9QUO0YT8OIZWLJ7IXGQN1Nqw,4693
+idf_build_apps-2.6.4.dist-info/RECORD,,