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

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

@@ -78,6 +78,7 @@ jobs:
             --size-file size_info.json
           pytest --cov idf_build_apps --cov-report term-missing:skip-covered --junit-xml pytest.xml | tee pytest-coverage.txt
       - name: Pytest coverage comment
+        if: github.event_name == 'pull_request'
         uses: MishaKav/pytest-coverage-comment@main
         with:
           pytest-coverage-path: pytest-coverage.txt

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

@@ -17,13 +17,13 @@ repos:
           - --use-current-year
         exclude: 'idf_build_apps/vendors/'
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.8.4'
+    rev: 'v0.9.5'
     hooks:
       - id: ruff
         args: ['--fix']
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.14.1'
+    rev: 'v1.15.0'
     hooks:
       - id: mypy
         args: ['--warn-unused-ignores']

{idf_build_apps-2.6.1 → idf_build_apps-2.6.3}/.readthedocs.yml

@@ -4,6 +4,10 @@
 
 version: 2
 
+sphinx:
+  # Path to your Sphinx configuration file.
+  configuration: docs/en/conf.py
+
 build:
   os: ubuntu-22.04
   tools:

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

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## v2.6.3 (2025-02-11)
+
+### Fix
+
+- stop returning duplicated apps in `find_apps`
+- compare app based on normalized paths
+- remove unnecessary check args in dependency-driven-build
+
+## v2.6.2 (2025-01-21)
+
+### Fix
+
+- windows root dir returns '\\' instead of the drive
+
 ## v2.6.1 (2025-01-13)
 
 ### Fix

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

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

{idf_build_apps-2.6.1 → idf_build_apps-2.6.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.6.1'
+__version__ = '2.6.3'
 
 from .session_args import (
     SessionArgs,

{idf_build_apps-2.6.1 → idf_build_apps-2.6.3}/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-2.6.1 → idf_build_apps-2.6.3}/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-2.6.1 → idf_build_apps-2.6.3}/idf_build_apps/main.py

@@ -99,7 +99,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 +107,7 @@ def find_apps(
 
     for _t in targets:
         for _p in find_arguments.paths:
-            apps.extend(
+            apps.update(
                 _find_apps(
                     _p,
                     _t,

{idf_build_apps-2.6.1 → idf_build_apps-2.6.3}/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.1 → idf_build_apps-2.6.3}/idf_build_apps/vendors/pydantic_sources.py

@@ -17,6 +17,7 @@ Modifications:
 - recursively find TOML file.
 """
 
+import logging
 import os
 import sys
 from abc import ABC, abstractmethod
@@ -30,6 +31,7 @@ from idf_build_apps.constants import IDF_BUILD_APPS_TOML_FN
 
 PathType = Union[Path, str, List[Union[Path, str]], Tuple[Union[Path, str], ...]]
 DEFAULT_PATH = Path('')
+LOGGER = logging.getLogger(__name__)
 
 
 class ConfigFileSourceMixin(ABC):
@@ -94,18 +96,18 @@ class TomlConfigSettingsSource(InitSettingsSource, ConfigFileSourceMixin):
         """
         if provided and Path(provided).is_file():
             fp = provided.resolve()
-            print(f'Loading config file: {fp}')
+            LOGGER.debug(f'Loading config file: {fp}')
             return fp
 
         rv = Path.cwd()
         count = -1
         while count < depth:
-            if str(rv) == rv.root:
+            if len(rv.parts) == 1:
                 break
 
             fp = rv / filename
             if fp.is_file():
-                print(f'Loading config file: {fp}')
+                LOGGER.debug(f'Loading config file: {fp}')
                 return fp
 
             rv = rv.parent

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

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

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

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

{idf_build_apps-2.6.1 → idf_build_apps-2.6.3}/tests/test_app.py

@@ -1,6 +1,7 @@
-# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-
+import contextlib
+import os
 
 import pytest
 from pydantic import (
@@ -95,3 +96,18 @@ def test_app_init_from_another():
     assert b.target == 'esp32c3'
     assert 'build_esp32_' == a.build_dir
     assert 'build_esp32c3_' == b.build_dir
+
+
+def test_app_hash():
+    a = CMakeApp('foo', 'esp32')
+    b = CMakeApp('foo/', 'esp32')
+    assert a == b
+    assert hash(a) == hash(b)
+    assert len(list({a, b})) == 1
+
+    with contextlib.chdir(os.path.expanduser('~')):
+        a = CMakeApp('foo', 'esp32')
+        b = CMakeApp(os.path.join('~', 'foo'), 'esp32')
+        assert a == b
+        assert hash(a) == hash(b)
+        assert len(list({a, b})) == 1

{idf_build_apps-2.6.1 → idf_build_apps-2.6.3}/tests/test_finder.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 logging
@@ -740,3 +740,21 @@ def test_find_apps_with_exclude(tmp_path, exclude_list, apps_count):
     os.chdir(tempfile.tempdir)
     apps = find_apps(str(tmp_path), 'esp32', recursive=True, exclude_list=exclude_list)
     assert len(apps) == apps_count
+
+
+def test_find_apps_with_duplicated_paths(tmp_path):
+    (tmp_path / 'folder1').mkdir()
+    create_project('test1', tmp_path / 'folder1')
+    create_project('test2', tmp_path / 'folder1')
+
+    assert (
+        len(
+            find_apps(
+                [str(tmp_path / 'folder1' / 'test1'), str(tmp_path / 'folder1')],
+                'esp32',
+                recursive=True,
+            )
+        )
+        == len(find_apps(str(tmp_path / 'folder1'), 'esp32', recursive=True))
+        == 2
+    )