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

{idf_build_apps-1.1.2 → idf_build_apps-1.1.4}/.github/workflows/test-build-idf-apps.yml

@@ -61,7 +61,9 @@ jobs:
           pyenv global ${{ matrix.python-version }}
           rm $(which python3)
           echo "urllib3<1.25,>=1.21.1" >> $IDF_PATH/requirements.txt
+          echo "brotli<1.1" >> $IDF_PATH/requirements.txt
           sed -i 's/idf-component-manager~=1.0/idf-component-manager<1.3/g' $IDF_PATH/requirements.txt
+          pip install -U pip
           bash $IDF_PATH/install.sh
           . $IDF_PATH/export.sh
           pip install idf_build_apps-*-py2.py3-none-any.whl

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

@@ -2,6 +2,19 @@
 
 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
+
+- pyyaml dependency for python version older than 3.5
+- stop recursively copy when work dir in app dir
+
 ## v1.1.2 (2023-08-16)
 
 ### Feat

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: idf-build-apps
-Version: 1.1.2
+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.*
@@ -19,7 +19,8 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: pathlib; python_version < '3.4'
 Requires-Dist: glob2; python_version < '3.5'
 Requires-Dist: pyparsing
-Requires-Dist: pyyaml
+Requires-Dist: pyyaml>=5.3; python_version >= '3.5'
+Requires-Dist: pyyaml<5.3; python_version < '3.5'
 Requires-Dist: packaging
 Requires-Dist: toml; python_version < '3.11'
 Requires-Dist: sphinx ; extra == "doc"

{idf_build_apps-1.1.2 → 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.2'
+__version__ = '1.1.4'
 
 LOGGER = logging.getLogger('idf_build_apps')
 

{idf_build_apps-1.1.2 → idf_build_apps-1.1.4}/idf_build_apps/app.py

@@ -598,7 +598,16 @@ class CMakeApp(App):
                     shutil.rmtree(self.work_dir)
             LOGGER.debug('==> Copying app from %s to %s', self.app_dir, self.work_dir)
             if not self.dry_run:
-                shutil.copytree(self.app_dir, self.work_dir)
+                # if the new directory inside the original directory,
+                # make sure not to go into recursion.
+                ignore = shutil.ignore_patterns(
+                    os.path.basename(self.work_dir),
+                    # also ignore files which may be present in the work directory
+                    'build',
+                    'sdkconfig',
+                )
+
+                shutil.copytree(self.app_dir, self.work_dir, ignore=ignore, symlinks=True)
 
         if os.path.exists(self.build_path):
             LOGGER.debug('==> Build directory %s exists, removing', self.build_path)

{idf_build_apps-1.1.2 → 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.2 → idf_build_apps-1.1.4}/pyproject.toml

@@ -29,7 +29,8 @@ dependencies = [
     "pathlib; python_version < '3.4'",
     "glob2; python_version < '3.5'",
     "pyparsing",
-    "pyyaml",
+    "pyyaml>=5.3; python_version >= '3.5'",
+    "pyyaml<5.3; python_version < '3.5'",
     "packaging",
     "toml; python_version < '3.11'",
 ]
@@ -60,7 +61,7 @@ idf-build-apps = "idf_build_apps:main.main"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.1.2"
+version = "1.1.4"
 tag_format = "v$version"
 version_files = [
     "idf_build_apps/__init__.py",

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

@@ -10,12 +10,13 @@ package_data = \
 {'': ['*']}
 
 install_requires = \
-['pyparsing', 'pyyaml', 'packaging']
+['pyparsing', 'packaging']
 
 extras_require = \
 {":python_version < '3.11'": ['toml'],
  ":python_version < '3.4'": ['pathlib'],
- ":python_version < '3.5'": ['glob2'],
+ ":python_version < '3.5'": ['glob2', 'pyyaml<5.3'],
+ ":python_version >= '3.5'": ['pyyaml>=5.3'],
  'doc': ['sphinx',
          'sphinx-rtd-theme',
          'sphinx_copybutton',
@@ -27,7 +28,7 @@ entry_points = \
 {'console_scripts': ['idf-build-apps = idf_build_apps:main.main']}
 
 setup(name='idf-build-apps',
-      version='1.1.2',
+      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.2 → idf_build_apps-1.1.4}/tests/conftest.py

@@ -26,26 +26,27 @@ def create_project(name, folder):
     os.makedirs(os.path.join(p, 'main'))
 
     with open(os.path.join(p, 'CMakeLists.txt'), 'w') as fw:
-        fw.writelines(
-            [
-                'cmake_minimum_required(VERSION 3.16)',
-                'include($ENV{IDF_PATH}/tools/cmake/project.cmake)',
-                'project({})'.format(name),
-            ]
+        fw.write(
+            """cmake_minimum_required(VERSION 3.16)
+include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)
+project({})
+""".format(
+                name
+            )
         )
 
     with open(os.path.join(p, 'main', 'CMakeLists.txt'), 'w') as fw:
-        fw.writelines(
-            [
-                'idf_component_register(SRCS "{}.c"'.format(name),
-                '    INCLUDE_DIRS ".")',
-            ]
+        fw.write(
+            """idf_component_register(SRCS "{}.c"
+INCLUDE_DIRS ".")
+""".format(
+                name
+            )
         )
 
-    with open(os.path.join(p, 'main', '{}.c'.format(name)), 'w') as fw:
-        fw.writelines(
-            [
-                '#include <stdio.h>',
-                'void app_main(void) {}',
-            ]
+    with open(os.path.join(p, 'main', f'{name}.c'), 'w') as fw:
+        fw.write(
+            """#include <stdio.h>
+void app_main(void) {}
+"""
         )

{idf_build_apps-1.1.2 → idf_build_apps-1.1.4}/tests/test_build.py

@@ -1,10 +1,16 @@
 # SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
+
+import os
 import shutil
 
 import pytest
+from conftest import (
+    create_project,
+)
 
 from idf_build_apps import (
+    build_apps,
     find_apps,
 )
 from idf_build_apps.app import (
@@ -103,3 +109,19 @@ def test_idf_version_keywords_type():
     assert isinstance(IDF_VERSION_MAJOR, int)
     assert isinstance(IDF_VERSION_MINOR, int)
     assert isinstance(IDF_VERSION_PATCH, int)
+
+
+@pytest.mark.skipif(not shutil.which('idf.py'), reason='idf.py not found')
+def test_work_dir_inside_relative_app_dir(tmp_path):
+    create_project('foo', tmp_path)
+
+    os.chdir(tmp_path / 'foo')
+    apps = find_apps(
+        '.',
+        'esp32',
+        work_dir=os.path.join('foo', 'bar'),
+    )
+    res = build_apps(apps)
+
+    assert len(apps) == 1
+    assert res == 0

{idf_build_apps-1.1.2 → 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'))