idf-build-apps 1.1.3__tar.gz → 1.1.4__tar.gz

{idf_build_apps-1.1.3 → idf_build_apps-1.1.4}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## v1.1.4 (2023-12-29)
+
+### Fix
+
+- stop modifying yaml dict shared by yaml anchors
+
 ## v1.1.3 (2023-11-13)
 
 ### Fix

{idf_build_apps-1.1.3 → idf_build_apps-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: idf-build-apps
-Version: 1.1.3
+Version: 1.1.4
 Summary: Tools for building ESP-IDF related apps.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*

{idf_build_apps-1.1.3 → idf_build_apps-1.1.4}/idf_build_apps/__init__.py

@@ -7,7 +7,7 @@ Tools for building ESP-IDF related apps.
 
 import logging
 
-__version__ = '1.1.3'
+__version__ = '1.1.4'
 
 LOGGER = logging.getLogger('idf_build_apps')
 

{idf_build_apps-1.1.3 → idf_build_apps-1.1.4}/idf_build_apps/manifest/manifest.py

@@ -59,15 +59,17 @@ class FolderRule:
     ):  # type: (...) -> None
         self.folder = folder.resolve()
 
-        for group in [enable, disable, disable_test]:
-            if group:
-                for d in group:
-                    d['stmt'] = d['if']  # avoid keyword `if`
-                    del d['if']
-
-        self.enable = [IfClause(**clause) for clause in enable] if enable else []
-        self.disable = [IfClause(**clause) for clause in disable] if disable else []
-        self.disable_test = [IfClause(**clause) for clause in disable_test] if disable_test else []
+        def _clause_to_if_clause(clause):  # type: (dict[str, str]) -> IfClause
+            _kwargs = {'stmt': clause['if']}
+            if 'temporary' in clause:
+                _kwargs['temporary'] = clause['temporary']
+            if 'reason' in clause:
+                _kwargs['reason'] = clause['reason']
+            return IfClause(**_kwargs)
+
+        self.enable = [_clause_to_if_clause(clause) for clause in enable] if enable else []
+        self.disable = [_clause_to_if_clause(clause) for clause in disable] if disable else []
+        self.disable_test = [_clause_to_if_clause(clause) for clause in disable_test] if disable_test else []
         self.depends_components = depends_components or []
         self.depends_filepatterns = depends_filepatterns or []
 

{idf_build_apps-1.1.3 → idf_build_apps-1.1.4}/pyproject.toml

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

{idf_build_apps-1.1.3 → idf_build_apps-1.1.4}/setup.py

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

{idf_build_apps-1.1.3 → idf_build_apps-1.1.4}/tests/test_manifest.py

@@ -44,6 +44,30 @@ test2:
     assert manifest.enable_test_targets('test2') == ['linux']
 
 
+def test_manifest_with_anchor(tmpdir, monkeypatch):
+    yaml_file = tmpdir / 'test.yml'
+    yaml_file.write_text(
+        """
+.base: &base
+  depends_components:
+    - a
+
+foo: &foo
+  <<: *base
+  disable:
+    - if: IDF_TARGET == "esp32"
+
+bar:
+  <<: *foo
+""",
+        encoding='utf8',
+    )
+
+    monkeypatch.setattr(idf_build_apps.manifest.manifest.FolderRule, 'DEFAULT_BUILD_TARGETS', ['esp32'])
+    manifest = Manifest.from_file(yaml_file)
+    assert manifest.enable_build_targets('bar') == []
+
+
 class TestIfParser:
     def test_idf_version(self, monkeypatch):
         monkeypatch.setattr(idf_build_apps.manifest.if_parser, 'IDF_VERSION', Version('5.9.0'))