idf-build-apps 2.5.2__tar.gz → 2.5.3__tar.gz

{idf_build_apps-2.5.2 → idf_build_apps-2.5.3}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## v2.5.3 (2024-10-04)
+
+### Feat
+
+- support --manifest-filepatterns
+
 ## v2.5.2 (2024-09-27)
 
 ### Fix

{idf_build_apps-2.5.2 → idf_build_apps-2.5.3}/PKG-INFO

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

{idf_build_apps-2.5.2 → idf_build_apps-2.5.3}/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.2'
+__version__ = '2.5.3'
 
 from .session_args import (
     SessionArgs,

{idf_build_apps-2.5.2 → idf_build_apps-2.5.3}/idf_build_apps/args.py

@@ -3,6 +3,7 @@
 
 import argparse
 import enum
+import glob
 import inspect
 import logging
 import os
@@ -191,6 +192,15 @@ class DependencyDrivenBuildArguments(GlobalArguments):
         validation_alias=AliasChoices('manifest_files', 'manifest_file'),
         default=None,
     )
+    manifest_filepatterns: t.Optional[t.List[str]] = field(
+        FieldMetadata(
+            validate_method=[ValidateMethod.TO_LIST],
+            nargs='+',
+        ),
+        description='space-separated list of file patterns to search for the manifest files. '
+        'The matched files will be loaded as the manifest files.',
+        default=None,
+    )
     manifest_rootpath: str = field(
         None,
         description='Root path to resolve the relative paths defined in the manifest files. '
@@ -279,6 +289,17 @@ class DependencyDrivenBuildArguments(GlobalArguments):
     def model_post_init(self, __context: Any) -> None:
         super().model_post_init(__context)
 
+        if self.manifest_filepatterns:
+            matched_paths = set()
+            for pat in [to_absolute_path(p, self.manifest_rootpath) for p in self.manifest_filepatterns]:
+                matched_paths.update(glob.glob(str(pat), recursive=True))
+
+            if matched_paths:
+                if self.manifest_files:
+                    self.manifest_files.extend(matched_paths)
+                else:
+                    self.manifest_files = list(matched_paths)
+
         Manifest.CHECK_MANIFEST_RULES = self.check_manifest_rules
         if self.manifest_files:
             App.MANIFEST = Manifest.from_files(

{idf_build_apps-2.5.2 → idf_build_apps-2.5.3}/pyproject.toml

@@ -60,7 +60,7 @@ idf-build-apps = "idf_build_apps:main.main"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "2.5.2"
+version = "2.5.3"
 tag_format = "v$version"
 version_files = [
     "idf_build_apps/__init__.py",

{idf_build_apps-2.5.2 → idf_build_apps-2.5.3}/setup.py

@@ -35,7 +35,7 @@ entry_points = \
 {'console_scripts': ['idf-build-apps = idf_build_apps:main.main']}
 
 setup(name='idf-build-apps',
-      version='2.5.2',
+      version='2.5.3',
       description='Tools for building ESP-IDF related apps.',
       author=None,
       author_email='Fu Hanxi <fuhanxi@espressif.com>',

{idf_build_apps-2.5.2 → idf_build_apps-2.5.3}/tests/test_cmd.py

@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-
+import os
 import sys
 from pathlib import Path
 
@@ -67,3 +67,31 @@ foobar:
                 f'foo:{sha_of_enable_only_esp32}\n'
                 f'foobar:{sha_of_enable_esp32_or_esp32s2}\n'
             )
+
+
+def test_manifest_patterns(tmp_path, monkeypatch, capsys):
+    manifest = tmp_path / 'manifest.yml'
+    manifest.write_text(
+        """foo:
+  enable:
+    - if: IDF_TARGET == "esp32"
+bar:
+  enable:
+    - if: IDF_TARGET == "esp32"
+        """
+    )
+
+    with pytest.raises(SystemExit) as e:
+        with monkeypatch.context() as m:
+            m.setattr(
+                sys,
+                'argv',
+                ['idf-build-apps', 'find', '--manifest-filepatterns', '**.whatever', '**/manifest.yml', '-vv'],
+            )
+            main()
+        assert e.retcode == 0
+
+    _, err = capsys.readouterr()
+    assert f'Loading manifest file {os.path.join(tmp_path, "manifest.yml")}' in err
+    assert f'"{os.path.join(tmp_path, "foo")}" does not exist' in err
+    assert f'"{os.path.join(tmp_path, "bar")}" does not exist' in err