idf-build-apps 2.6.0__tar.gz → 2.6.1__tar.gz

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/.github/workflows/publish-pypi.yml

@@ -3,16 +3,16 @@ name: Publish PyPI
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: "3.7"
       - name: Publish packages
         env:
           FLIT_USERNAME: __token__

idf_build_apps-2.6.1/.github/workflows/sync-jira.yml

@@ -0,0 +1,61 @@
+# FILE: .github/workflows/sync-jira.yml
+---
+# This GitHub Actions workflow synchronizes GitHub issues, comments, and pull requests with Jira.
+# It triggers on new issues, issue comments, and on a scheduled basis.
+# The workflow uses a custom action to perform the synchronization with Jira (espressif/sync-jira-actions).
+
+name: 🔷 Sync to Jira
+
+run-name: >
+  Sync to Jira -
+  ${{ github.event_name == 'issue_comment' && 'Issue Comment' ||
+      github.event_name == 'schedule' && 'New Pull Requests' ||
+      github.event_name == 'issues' && 'New Issue' ||
+      github.event_name == 'workflow_dispatch' && 'Manual Sync' }}
+
+on:
+  issues: { types: [opened] }
+  issue_comment: { types: [created, edited, deleted] }
+  schedule: [cron: "0 * * * *"]
+  workflow_dispatch:
+    inputs:
+      action:
+        {
+          description: "Action to be performed",
+          required: true,
+          default: "mirror-issues",
+        }
+      issue-numbers:
+        {
+          description: "Issue numbers to sync (comma-separated)",
+          required: true,
+        }
+
+jobs:
+  sync-to-jira:
+    name: >
+      Sync to Jira -
+      ${{ github.event_name == 'issue_comment' && 'Issue Comment' ||
+          github.event_name == 'schedule' && 'New Pull Requests' ||
+          github.event_name == 'issues' && 'New Issue' ||
+          github.event_name == 'workflow_dispatch' && 'Manual Sync' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+
+      - name: Run synchronization to Jira
+        uses: espressif/sync-jira-actions@v1
+        with:
+          cron_job: ${{ github.event_name == 'schedule' && 'true' || '' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: RDT
+          JIRA_COMPONENT: idf-build-apps
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/.github/workflows/test-build-docs.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   build-docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/.github/workflows/test-build-idf-apps.yml

@@ -17,7 +17,7 @@ defaults:
 
 jobs:
   build-python-packages:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/.pre-commit-config.yaml

@@ -37,6 +37,7 @@ repos:
           - types-toml
           - pytest
           - argcomplete>=3
+          - esp-bool-parser>=0.1.2,<1
   - repo: https://github.com/hfudev/rstfmt
     rev: v0.1.4
     hooks:

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## v2.6.1 (2025-01-13)
+
+### Fix
+
+- --config-file not refreshed
+
 ## v2.6.0 (2025-01-02)
 
 ### Feat

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: idf-build-apps
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tools for building ESP-IDF related apps.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=3.7
@@ -21,6 +21,7 @@ Requires-Dist: pydantic~=2.0
 Requires-Dist: pydantic_settings
 Requires-Dist: argcomplete>=3
 Requires-Dist: typing-extensions; python_version < '3.11'
+Requires-Dist: esp-bool-parser>=0.1.2,<1
 Requires-Dist: sphinx ; extra == "doc"
 Requires-Dist: sphinx-rtd-theme ; extra == "doc"
 Requires-Dist: sphinx_copybutton ; extra == "doc"

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

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/idf_build_apps/args.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 
 import argparse
@@ -115,8 +115,9 @@ def get_meta(f: FieldInfo) -> t.Optional[FieldMetadata]:
 class BaseArguments(BaseSettings):
     """Base settings class for all settings classes"""
 
+    CONFIG_FILE_PATH: t.ClassVar[t.Optional[Path]] = None
+
     model_config = SettingsConfigDict(
-        toml_file=IDF_BUILD_APPS_TOML_FN,
         # these below two are supported in pydantic 2.6
         pyproject_toml_table_header=('tool', 'idf-build-apps'),
         pyproject_toml_depth=sys.maxsize,
@@ -132,11 +133,15 @@ class BaseArguments(BaseSettings):
         dotenv_settings: PydanticBaseSettingsSource,  # noqa: ARG003
         file_secret_settings: PydanticBaseSettingsSource,  # noqa: ARG003
     ) -> t.Tuple[PydanticBaseSettingsSource, ...]:
-        return (
-            init_settings,
-            TomlConfigSettingsSource(settings_cls),
-            PyprojectTomlConfigSettingsSource(settings_cls),
-        )
+        sources: t.Tuple[PydanticBaseSettingsSource, ...] = (init_settings,)
+        if cls.CONFIG_FILE_PATH is None:
+            sources += (TomlConfigSettingsSource(settings_cls, toml_file=Path(IDF_BUILD_APPS_TOML_FN)),)
+            sources += (PyprojectTomlConfigSettingsSource(settings_cls, toml_file=Path('pyproject.toml')),)
+        else:
+            sources += (TomlConfigSettingsSource(settings_cls, toml_file=Path(cls.CONFIG_FILE_PATH)),)
+            sources += (PyprojectTomlConfigSettingsSource(settings_cls, toml_file=Path(cls.CONFIG_FILE_PATH)),)
+
+        return sources
 
     @field_validator('*', mode='before')
     @classmethod
@@ -874,12 +879,20 @@ def add_args_to_obj_doc_as_params(argument_cls: t.Type[GlobalArguments], obj: t.
     _obj.__doc__ = _doc_str
 
 
-def apply_config_file(config_file: t.Optional[str]) -> None:
+def apply_config_file(config_file: t.Optional[str] = None, reset: bool = False) -> None:
     def _subclasses(klass: t.Type[T]) -> t.Set[t.Type[T]]:
         return set(klass.__subclasses__()).union([s for c in klass.__subclasses__() for s in _subclasses(c)])
 
-    if config_file:
-        BaseArguments.model_config['toml_file'] = str(config_file)
-        # modify all subclasses
+    if reset:
+        BaseArguments.CONFIG_FILE_PATH = None
         for cls in _subclasses(BaseArguments):
-            cls.model_config['toml_file'] = str(config_file)
+            cls.CONFIG_FILE_PATH = None
+
+    if config_file:
+        if os.path.isfile(config_file):
+            p = Path(config_file)
+            BaseArguments.CONFIG_FILE_PATH = p
+            for cls in _subclasses(BaseArguments):
+                cls.CONFIG_FILE_PATH = p
+        else:
+            LOGGER.warning(f'Config file {config_file} does not exist. Ignoring...')

idf_build_apps-2.6.1/idf_build_apps/constants.py

@@ -0,0 +1,77 @@
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
+
+import enum
+import os
+
+import esp_bool_parser
+
+IDF_PATH = esp_bool_parser.IDF_PATH
+IDF_PY = os.path.join(IDF_PATH, 'tools', 'idf.py')
+IDF_SIZE_PY = os.path.join(IDF_PATH, 'tools', 'idf_size.py')
+
+PROJECT_DESCRIPTION_JSON = 'project_description.json'
+DEFAULT_SDKCONFIG = 'sdkconfig.defaults'
+
+SUPPORTED_TARGETS = esp_bool_parser.SUPPORTED_TARGETS
+PREVIEW_TARGETS = esp_bool_parser.PREVIEW_TARGETS
+ALL_TARGETS = esp_bool_parser.ALL_TARGETS
+IDF_VERSION_MAJOR = esp_bool_parser.IDF_VERSION_MAJOR
+IDF_VERSION_MINOR = esp_bool_parser.IDF_VERSION_MINOR
+IDF_VERSION_PATCH = esp_bool_parser.IDF_VERSION_PATCH
+IDF_VERSION = esp_bool_parser.IDF_VERSION
+
+
+class BuildStatus(str, enum.Enum):
+    UNKNOWN = 'unknown'
+    DISABLED = 'disabled'
+    SKIPPED = 'skipped'
+    SHOULD_BE_BUILT = 'should be built'
+    FAILED = 'build failed'
+    SUCCESS = 'build success'
+
+
+class BuildStage(str, enum.Enum):
+    DRY_RUN = 'Dry Run'
+    PRE_BUILD = 'Pre Build'
+    BUILD = 'Build'
+    POST_BUILD = 'Post Build'
+
+    @classmethod
+    def max_length(cls) -> int:
+        return max(len(v.value) for v in cls.__members__.values())
+
+
+completion_instructions = """
+With the `--activate` option, detect your shell type and add the appropriate commands to your shell's config file
+so that it runs on startup. You will likely have to restart.
+or re-login for the autocompletion to start working.
+
+You can also specify your shell using the `--shell` option.
+
+If you do not want automatic modification of your shell configuration file
+You can manually add the commands provided below to activate autocompletion.
+or run them in your current terminal session for one-time activation.
+
+Once again, you will likely have to restart
+or re-login for the autocompletion to start working.
+
+bash:
+    eval "$(register-python-argcomplete idf-build-apps)"
+
+zsh:
+    To activate completions in zsh, first make sure compinit is marked for
+    autoload and run autoload:
+
+    autoload -U compinit
+    compinit
+
+    Afterwards you can enable completions for idf-build-apps:
+
+    eval "$(register-python-argcomplete idf-build-apps)"
+
+fish:
+    # Not required to be in the config file, only run once
+    register-python-argcomplete --shell fish idf-build-apps >~/.config/fish/completions/idf-build-apps.fish
+"""
+IDF_BUILD_APPS_TOML_FN = '.idf_build_apps.toml'

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/idf_build_apps/main.py

@@ -1,6 +1,6 @@
 # PYTHON_ARGCOMPLETE_OK
 
-# 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 argparse
@@ -68,7 +68,8 @@ def find_apps(
 
     :return: list of found apps
     """
-    apply_config_file(config_file)
+    if config_file:
+        apply_config_file(config_file)
 
     # compatible with old usage
     ## `preserve`
@@ -132,7 +133,8 @@ def build_apps(
 
     :return: exit code
     """
-    apply_config_file(config_file)
+    if config_file:
+        apply_config_file(config_file)
 
     # compatible with old usage
     ## `check_app_dependencies`
@@ -385,8 +387,8 @@ def main():
     kwargs = vars(args)
     action = kwargs.pop('action')
     config_file = kwargs.pop('config_file')
-
-    apply_config_file(config_file)
+    if config_file:
+        apply_config_file(config_file)
 
     if action == 'dump-manifest-sha':
         arguments = DumpManifestShaArguments(**drop_none_kwargs(kwargs))

idf_build_apps-2.6.1/idf_build_apps/manifest/__init__.py

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Manifest file
+"""
+
+from esp_bool_parser import register_addition_attribute
+
+from .manifest import FolderRule
+
+
+def folder_rule_attr(target, **kwargs):
+    return 1 if target in FolderRule.DEFAULT_BUILD_TARGETS else 0
+
+
+register_addition_attribute('INCLUDE_DEFAULT', folder_rule_attr)

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/idf_build_apps/manifest/manifest.py

@@ -1,11 +1,11 @@
-# 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 logging
 import os
-import pickle
 import typing as t
 from hashlib import sha512
 
+from esp_bool_parser import BoolStmt, parse_bool_expr
 from pyparsing import (
     ParseException,
 )
@@ -23,10 +23,6 @@ from ..utils import (
 from ..yaml import (
     parse,
 )
-from .if_parser import (
-    BOOL_EXPR,
-    BoolStmt,
-)
 
 LOGGER = logging.getLogger(__name__)
 
@@ -34,7 +30,8 @@ LOGGER = logging.getLogger(__name__)
 class IfClause:
     def __init__(self, stmt: str, temporary: bool = False, reason: t.Optional[str] = None) -> None:
         try:
-            self.stmt: BoolStmt = BOOL_EXPR.parseString(stmt)[0]
+            self.stmt: BoolStmt = parse_bool_expr(stmt)
+            self._stmt: str = stmt
         except (ParseException, InvalidIfClause) as ex:
             raise InvalidIfClause(f'Invalid if clause: {stmt}. {ex}')
 
@@ -51,6 +48,9 @@ class IfClause:
                 f'    reason: lack of ci runners'
             )
 
+    def __repr__(self):
+        return f'IfClause(stmt={self._stmt!r}, temporary={self.temporary!r}, reason={self.reason!r})'
+
     def get_value(self, target: str, config_name: str) -> t.Any:
         return self.stmt.get_value(target, config_name)
 
@@ -69,6 +69,14 @@ class SwitchClause:
                 return content
         return self.default_clause
 
+    def __repr__(self) -> str:
+        return (
+            f'SwitchClause('
+            f'if_clauses={self.if_clauses!r}, '
+            f'contents={self.contents!r}, '
+            f'default_clause={self.default_clause!r})'
+        )
+
 
 class FolderRule:
     DEFAULT_BUILD_TARGETS = SUPPORTED_TARGETS
@@ -153,7 +161,7 @@ class FolderRule:
             self.depends_components,
             self.depends_filepatterns,
         ]:
-            sha.update(pickle.dumps(obj, protocol=4))  # protocol 4 by default is set in Python 3.8
+            sha.update(repr(obj).encode())
 
         return sha.hexdigest()
 

idf_build_apps-2.6.1/idf_build_apps/manifest/soc_header.py

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
+
+import esp_bool_parser
+
+SOC_HEADERS = esp_bool_parser.SOC_HEADERS

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/idf_build_apps/vendors/pydantic_sources.py

@@ -93,7 +93,9 @@ class TomlConfigSettingsSource(InitSettingsSource, ConfigFileSourceMixin):
         :param depth: Number of directories up the tree to check of a pyproject.toml.
         """
         if provided and Path(provided).is_file():
-            return provided.resolve()
+            fp = provided.resolve()
+            print(f'Loading config file: {fp}')
+            return fp
 
         rv = Path.cwd()
         count = -1

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/pyproject.toml

@@ -31,6 +31,7 @@ dependencies = [
     "pydantic_settings",
     "argcomplete>=3",
     "typing-extensions; python_version < '3.11'",
+    "esp-bool-parser>=0.1.2,<1"
 ]
 
 [project.optional-dependencies]
@@ -61,7 +62,7 @@ idf-build-apps = "idf_build_apps:main.main"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "2.6.0"
+version = "2.6.1"
 tag_format = "v$version"
 version_files = [
     "idf_build_apps/__init__.py",
@@ -156,5 +157,8 @@ typing-modules = [
 quote-style = "single"
 docstring-code-format = true
 
+[tool.ruff.lint.flake8-unused-arguments]
+ignore-variadic-names = true
+
 [tool.mypy]
 python_version = "3.8"

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/setup.py

@@ -19,7 +19,8 @@ install_requires = \
  'packaging',
  'pydantic~=2.0',
  'pydantic_settings',
- 'argcomplete>=3']
+ 'argcomplete>=3',
+ 'esp-bool-parser>=0.1.2,<1']
 
 extras_require = \
 {":python_version < '3.11'": ['toml', 'typing-extensions'],
@@ -36,7 +37,7 @@ entry_points = \
 {'console_scripts': ['idf-build-apps = idf_build_apps:main.main']}
 
 setup(name='idf-build-apps',
-      version='2.6.0',
+      version='2.6.1',
       description='Tools for building ESP-IDF related apps.',
       author=None,
       author_email='Fu Hanxi <fuhanxi@espressif.com>',

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/tests/conftest.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 os
 
@@ -10,7 +10,7 @@ from idf_build_apps import (
     setup_logging,
 )
 from idf_build_apps.args import apply_config_file
-from idf_build_apps.constants import IDF_BUILD_APPS_TOML_FN, SUPPORTED_TARGETS
+from idf_build_apps.constants import SUPPORTED_TARGETS
 from idf_build_apps.manifest.manifest import FolderRule
 
 
@@ -19,7 +19,7 @@ def clean_cls_attr(tmp_path):
     App.MANIFEST = None
     FolderRule.DEFAULT_BUILD_TARGETS = SUPPORTED_TARGETS
     idf_build_apps.SESSION_ARGS.clean()
-    apply_config_file(IDF_BUILD_APPS_TOML_FN)
+    apply_config_file(reset=True)
     os.chdir(tmp_path)
 
 
@@ -63,7 +63,7 @@ def sha_of_enable_only_esp32():
     # !!! ONLY CHANGE IT WHEN NECESSARY !!!
     assert (
         sha
-        == '6fd3175a5068c46bccc411efadf3b98314210e775c25c62833998bff8b0cf1bc1daf738326f138f0d6629caa07338428f2aa122e2b830e6ad43662057c7ea0b1'  # noqa: E501
+        == 'bfc1c61176cfb76169eab6c4f00dbcc4d7886fee4b93ede5fac2c005dd85db640464e9b03986d3da3bfaa4d109b053862c07dc4d5a407e58f773a8f710ec60cb'  # noqa: E501
     )
 
     return sha
@@ -76,7 +76,7 @@ def sha_of_enable_esp32_or_esp32s2():
     # !!! ONLY CHANGE IT WHEN NECESSARY !!!
     assert (
         sha
-        == 'f3408e9bf1d6b9a9e14559e6567917986678a3414229b29f96493aec4dc1bc3e6d0ecc4f79adced0d5c26bc1cd80a4d15fe6aaefa5d1e7033a58290374f4fc7f'  # noqa: E501
+        == '9ab121a0d39bcb590465837091e82dfd798cd1ff9579e92c23e8bebaee127b46751108f0de3953993cb7993903e45d78851fc465d774a606b0ab1251fbe4b9f5'  # noqa: E501
     )
 
     return sha

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/tests/test_args.py

@@ -1,6 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 import os
+from tempfile import NamedTemporaryFile
 from xml.etree import ElementTree
 
 import pytest
@@ -323,3 +324,39 @@ dry_run = false
         assert test_suite.attrib['skipped'] == '2'
         assert test_suite.findall('testcase')[0].attrib['name'] == 'foo/build_esp32'
         assert test_suite.findall('testcase')[1].attrib['name'] == 'foo/build_esp32s2'
+
+    def test_config_file_by_cli(self, tmp_path, monkeypatch):
+        create_project('foo', tmp_path)
+        create_project('bar', tmp_path)
+
+        with open(IDF_BUILD_APPS_TOML_FN, 'w') as fw:
+            fw.write('paths = ["foo"]')
+
+        with NamedTemporaryFile(mode='w', suffix='.toml') as ft:
+            ft.write('paths = ["bar"]')
+            ft.flush()
+
+            with monkeypatch.context() as m:
+                m.setattr(
+                    'sys.argv',
+                    [
+                        'idf-build-apps',
+                        'build',
+                        '-t',
+                        'esp32',
+                        '--config-file',
+                        ft.name,
+                        '--junitxml',
+                        'test.xml',
+                        '--dry-run',
+                    ],
+                )
+                main()
+
+        with open('test.xml') as f:
+            xml = ElementTree.fromstring(f.read())
+        test_suite = xml.findall('testsuite')[0]
+        assert test_suite.attrib['failures'] == '0'
+        assert test_suite.attrib['errors'] == '0'
+        assert test_suite.attrib['skipped'] == '1'
+        assert test_suite.findall('testcase')[0].attrib['name'] == 'bar/build'

{idf_build_apps-2.6.0 → idf_build_apps-2.6.1}/tests/test_manifest.py

@@ -1,21 +1,15 @@
-# 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 os
 
 import pytest
 import yaml
-from packaging.version import (
-    Version,
-)
 
 import idf_build_apps
 from idf_build_apps import setup_logging
 from idf_build_apps.constants import (
     SUPPORTED_TARGETS,
 )
-from idf_build_apps.manifest.if_parser import (
-    BOOL_STMT,
-)
 from idf_build_apps.manifest.manifest import (
     IfClause,
     Manifest,
@@ -70,6 +64,37 @@ test2:
     assert manifest.enable_build_targets('test23') == sorted(SUPPORTED_TARGETS)
 
 
+def test_repr(tmp_path):
+    yaml_file = tmp_path / 'test.yml'
+
+    yaml_file.write_text(
+        """
+test1:
+  enable:
+    - if: IDF_TARGET == "esp32c3"
+      reason: "None"
+  depends_components:
+    - if: IDF_VERSION == "1.2.3" or IDF_VERSION_MAJOR == 4
+      content: [ "VVV" ]
+    - if: CONFIG_NAME == "AAA"
+      content: [ "AAA" ]
+    - default: ["some_1", "some_2", "some_3"]
+
+""",
+        encoding='utf8',
+    )
+
+    manifest = Manifest.from_file(yaml_file)
+    manifest_rule = manifest.rules[0]
+    assert (
+        repr(manifest_rule.enable) == """[IfClause(stmt='IDF_TARGET == "esp32c3"', temporary=False, reason='None')]"""
+    )
+    assert (
+        repr(manifest_rule.depends_components)
+        == """SwitchClause(if_clauses=[IfClause(stmt='IDF_VERSION == "1.2.3" or IDF_VERSION_MAJOR == 4', temporary=False, reason=None), IfClause(stmt='CONFIG_NAME == "AAA"', temporary=False, reason=None)], contents=[['VVV'], ['AAA']], default_clause=['some_1', 'some_2', 'some_3'])"""  # noqa
+    )
+
+
 def test_manifest_switch_clause(tmp_path):
     yaml_file = tmp_path / 'test.yml'
     from idf_build_apps.constants import (
@@ -511,14 +536,6 @@ baz:
 
 
 class TestIfParser:
-    def test_idf_version(self, monkeypatch):
-        monkeypatch.setattr(idf_build_apps.manifest.if_parser, 'IDF_VERSION', Version('5.9.0'))
-        statement = 'IDF_VERSION > "5.10.0"'
-        assert BOOL_STMT.parseString(statement)[0].get_value('esp32', 'foo') is False
-
-        statement = 'IDF_VERSION in  ["5.9.0"]'
-        assert BOOL_STMT.parseString(statement)[0].get_value('esp32', 'foo') is True
-
     def test_invalid_if_statement(self):
         statement = '1'
         with pytest.raises(InvalidIfClause, match='Invalid if clause: 1'):
@@ -527,11 +544,3 @@ class TestIfParser:
     def test_temporary_must_with_reason(self):
         with pytest.raises(InvalidIfClause, match='"reason" must be set when "temporary: true"'):
             IfClause(stmt='IDF_TARGET == "esp32"', temporary=True)
-
-
-def test_consecutive_or_and_stml_manifest():
-    with pytest.raises(InvalidIfClause, match='Chaining "and"/"or" is not allowed'):
-        IfClause(stmt='IDF_TARGET == "esp32" or IDF_TARGET == "esp32c3" or IDF_TARGET == "esp32s3"')
-
-    with pytest.raises(InvalidIfClause, match='Chaining "and"/"or" is not allowed'):
-        IfClause(stmt='IDF_TARGET == "esp32" or IDF_TARGET == "esp32c3" and IDF_TARGET == "esp32s3"')