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

idf_build_apps/args.py

@@ -39,7 +39,6 @@ LOGGER = logging.getLogger(__name__)
 
 class ValidateMethod(str, enum.Enum):
     TO_LIST = 'to_list'
-    EXPAND_VARS = 'expand_vars'
 
 
 @dataclass
@@ -174,12 +173,17 @@ class BaseArguments(BaseSettings):
         if info.field_name and info.field_name in cls.model_fields:
             f = cls.model_fields[info.field_name]
             meta = get_meta(f)
+
+            # always expand vars for all fields
+            if isinstance(v, str):
+                v = expand_vars(v)
+            elif isinstance(v, list):
+                v = [expand_vars(item) if isinstance(item, str) else item for item in v]
+
             if meta and meta.validate_method:
                 for method in meta.validate_method:
                     if method == ValidateMethod.TO_LIST:
                         v = to_list(v)
-                    elif method == ValidateMethod.EXPAND_VARS:
-                        v = expand_vars(v)
                     else:
                         raise NotImplementedError(f'Unknown validate method: {method}')
 
@@ -241,9 +245,7 @@ class DependencyDrivenBuildArguments(GlobalArguments):
         default=None,  # type: ignore
     )
     manifest_rootpath: str = field(
-        FieldMetadata(
-            validate_method=[ValidateMethod.EXPAND_VARS],
-        ),
+        None,
         description='Root path to resolve the relative paths defined in the manifest files. '
         'By default set to the current directory. Support environment variables.',
         default=os.curdir,  # type: ignore
@@ -420,6 +422,15 @@ class FindBuildArguments(DependencyDrivenBuildArguments):
         description='Filter the apps by target. By default set to "all"',
         default='all',  # type: ignore
     )
+    extra_pythonpaths: t.Optional[t.List[str]] = field(
+        FieldMetadata(
+            validate_method=[ValidateMethod.TO_LIST],
+            nargs='+',
+        ),
+        description='space-separated list of additional Python paths to search for the app classes. '
+        'Will be injected into the head of sys.path.',
+        default=None,  # type: ignore
+    )
     build_system: t.Union[str, t.Type[App]] = field(
         None,
         description='Filter the apps by build system. By default set to "cmake". '
@@ -608,6 +619,14 @@ class FindBuildArguments(DependencyDrivenBuildArguments):
         if self.override_sdkconfig_files or self.override_sdkconfig_items:
             SESSION_ARGS.set(self)
 
+        # update PYTHONPATH
+        if self.extra_pythonpaths:
+            LOGGER.debug('Adding extra Python paths: %s', self.extra_pythonpaths)
+            for path in self.extra_pythonpaths:
+                abs_path = to_absolute_path(path)
+                if abs_path not in sys.path:
+                    sys.path.insert(0, abs_path)
+
         # load build system
         # here could be a string or a class of type App
         if not isinstance(self.build_system, str):
@@ -770,7 +789,6 @@ class BuildArguments(FindBuildArguments):
         FieldMetadata(
             deprecates={'collect_size_info': {}},
             hidden=True,
-            validate_method=[ValidateMethod.EXPAND_VARS],
         ),
         description='Record size json filepath of the built apps to the specified file. '
         'Each line is a json string. Can expand placeholders @p. Support environment variables.',
@@ -782,7 +800,6 @@ class BuildArguments(FindBuildArguments):
         FieldMetadata(
             deprecates={'collect_app_info': {}},
             hidden=True,
-            validate_method=[ValidateMethod.EXPAND_VARS],
         ),
         description='Record serialized app model of the built apps to the specified file. '
         'Each line is a json string. Can expand placeholders @p. Support environment variables.',
@@ -794,7 +811,6 @@ class BuildArguments(FindBuildArguments):
         FieldMetadata(
             deprecates={'junitxml': {}},
             hidden=True,
-            validate_method=[ValidateMethod.EXPAND_VARS],
         ),
         description='Path to the junitxml file to record the build results. Can expand placeholder @p. '
         'Support environment variables.',

{idf_build_apps-2.10.3.dist-info → idf_build_apps-2.11.0.dist-info}/METADATA

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

{idf_build_apps-2.10.3.dist-info → idf_build_apps-2.11.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-idf_build_apps/__init__.py,sha256=flY7hiaet_0R_QNgtqucTKZAd4e5K99pTLbdxVDGevY,711
+idf_build_apps/__init__.py,sha256=dbJfW0hQTTG-x5k9tWW9qp2EUUYU0CFxCuabbnGJWt4,711
 idf_build_apps/__main__.py,sha256=pT6OsFQRjCw39Jg43HAeGKzq8h5E_0m7kHDE2QMqDe0,182
 idf_build_apps/app.py,sha256=Z4TZegsyushNPvWcdSv4jJG1TIkuBMGdQ5FkpOSDFlE,36915
-idf_build_apps/args.py,sha256=nyKUDZjP_urzZDmJbkmq_32y0t6wwt-3N59MjLYHWPE,38414
+idf_build_apps/args.py,sha256=Ria0VDBtnUyN3fgHbG9S9P7gyWYoJ3YxrN_C0z6XEeQ,38977
 idf_build_apps/autocompletions.py,sha256=2fZQxzgZ21ie_2uk-B-7-xWYCChfOSgRFRYb7I2Onfo,2143
 idf_build_apps/constants.py,sha256=2iwLPZRhSQcn1v4RAcOJnHbqp1fDTp6A1gHaxn5ciTE,2166
 idf_build_apps/finder.py,sha256=yJnsYdcbX-TzUDrp8h1YJrLfBziQW4RiyLiJ47sHRY4,6375
@@ -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=R6pYasVsD31maeZ4dWRZnS10hwzM7gXdnfzDsOIRJ-4,167
 idf_build_apps/yaml/parser.py,sha256=IhY7rCWXOxrzzgEiKipTdPs_8yXDf8JZr-sMewV1pk8,2133
-idf_build_apps-2.10.3.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
-idf_build_apps-2.10.3.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-idf_build_apps-2.10.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-idf_build_apps-2.10.3.dist-info/METADATA,sha256=9T4kiw8GB4e5qFzKD7W76N4ufKqT1HeXd5H_YOw47vU,4795
-idf_build_apps-2.10.3.dist-info/RECORD,,
+idf_build_apps-2.11.0.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
+idf_build_apps-2.11.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+idf_build_apps-2.11.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+idf_build_apps-2.11.0.dist-info/METADATA,sha256=v9SrMcpVGeGM3HhR8rxJrdO2WfRAwedxth8Pf4OBexY,4795
+idf_build_apps-2.11.0.dist-info/RECORD,,