idf-build-apps 2.3.0__tar.gz → 2.3.1__tar.gz

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/.github/workflows/check-pre-commit.yml

@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
       - id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v44
       - uses: pre-commit/action@v3.0.1
         with:
           extra_args: --files ${{ steps.changed-files.outputs.all_changed_files }}

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## v2.3.1 (2024-04-22)
+
+### Fix
+
+- copy sdkconfig file while `_post_build` instead of the final phase of `build_apps`
+
 ## v2.3.0 (2024-03-20)
 
 ### Feat

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/PKG-INFO

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

{idf_build_apps-2.3.0 → idf_build_apps-2.3.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.3.0'
+__version__ = '2.3.1'
 
 from .session_args import (
     SessionArgs,

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/idf_build_apps/app.py

@@ -124,6 +124,7 @@ class App(BaseModel):
     verbose: bool = False
     check_warnings: bool = False
     preserve: bool = True
+    copy_sdkconfig: bool = False
 
     # build_apps() related
     build_apps_args: t.Optional[BuildAppsArgs] = None
@@ -561,6 +562,17 @@ class App(BaseModel):
     def _post_build(self) -> None:
         self._build_stage = BuildStage.POST_BUILD
 
+        if self.copy_sdkconfig:
+            try:
+                shutil.copy(
+                    os.path.join(self.work_dir, 'sdkconfig'),
+                    os.path.join(self.build_path, 'sdkconfig'),
+                )
+            except Exception as e:
+                self._logger.warning('Copy sdkconfig file from failed: %s', e)
+            else:
+                self._logger.debug('Copied sdkconfig file from %s to %s', self.work_dir, self.build_path)
+
         if not os.path.isfile(self.build_log_path):
             return
 

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/idf_build_apps/main.py

@@ -6,7 +6,6 @@ import json
 import logging
 import os
 import re
-import shutil
 import sys
 import textwrap
 import typing as t
@@ -324,6 +323,7 @@ def build_apps(
         app.dry_run = dry_run
         app.index = index
         app.verbose = build_verbose
+        app.copy_sdkconfig = copy_sdkconfig
 
         LOGGER.info('(%s/%s) Building app: %s', index, len(apps), app)
 
@@ -353,17 +353,6 @@ def build_apps(
                 fw.write(app.to_json() + '\n')
             LOGGER.debug('Recorded app info in %s', build_apps_args.collect_app_info)
 
-        if copy_sdkconfig:
-            try:
-                shutil.copy(
-                    os.path.join(app.work_dir, 'sdkconfig'),
-                    os.path.join(app.build_path, 'sdkconfig'),
-                )
-            except Exception as e:
-                LOGGER.warning('Copy sdkconfig file from failed: %s', e)
-            else:
-                LOGGER.debug('Copied sdkconfig file from %s to %s', app.work_dir, app.build_path)
-
         if app.build_status == BuildStatus.FAILED:
             if not keep_going:
                 return 1

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/pyproject.toml

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

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/setup.py

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

{idf_build_apps-2.3.0 → idf_build_apps-2.3.1}/tests/test_manifest.py

@@ -122,7 +122,8 @@ test5:
 
     os.chdir(tmpdir)
     Manifest.ROOTPATH = tmpdir
-    manifest = Manifest.from_file(yaml_file)
+    with pytest.warns(UserWarning, match='Folder ".+" does not exist. Please check your manifest file'):
+        manifest = Manifest.from_file(yaml_file)
 
     assert manifest.depends_components('test1', None, None) == ['VVV']
     assert manifest.depends_components('test1', None, 'AAA') == ['VVV']
@@ -175,7 +176,8 @@ test1:
     )
     os.chdir(tmpdir)
     Manifest.ROOTPATH = tmpdir
-    manifest = Manifest.from_file(yaml_file)
+    with pytest.warns(UserWarning, match='Folder ".+" does not exist. Please check your manifest file'):
+        manifest = Manifest.from_file(yaml_file)
 
     assert manifest.depends_components('test1', None, None) == ['DF']
     assert manifest.depends_components('test1', None, 'CCC') == ['DF']
@@ -202,7 +204,8 @@ def test_manifest_switch_clause_wrong_manifest_format(tmpdir):
         encoding='utf8',
     )
     try:
-        Manifest.from_file(yaml_file)
+        with pytest.warns(UserWarning, match='Folder ".+" does not exist. Please check your manifest file'):
+            Manifest.from_file(yaml_file)
     except InvalidManifest as e:
         assert str(e) == "Only the 'if' and 'default' keywords are supported in switch clause."
 
@@ -219,7 +222,8 @@ def test_manifest_switch_clause_wrong_manifest_format(tmpdir):
         encoding='utf8',
     )
     try:
-        Manifest.from_file(yaml_file)
+        with pytest.warns(UserWarning, match='Folder ".+" does not exist. Please check your manifest file'):
+            Manifest.from_file(yaml_file)
     except InvalidManifest as e:
         assert str(e) == 'Current manifest format has to fit either the switch format or the list format.'
 
@@ -260,7 +264,9 @@ foo:
 """,
         encoding='utf8',
     )
-    manifest = Manifest.from_file(yaml_file)
+    with pytest.warns(UserWarning, match='Folder ".+" does not exist. Please check your manifest file'):
+        manifest = Manifest.from_file(yaml_file)
+
     assert manifest.enable_build_targets('foo') == sorted(SUPPORTED_TARGETS)
 
     yaml_file.write_text(
@@ -281,7 +287,9 @@ examples/wifi/coexist:
         encoding='utf8',
     )
 
-    manifest = Manifest.from_file(yaml_file)
+    with pytest.warns(UserWarning, match='Folder ".+" does not exist. Please check your manifest file'):
+        manifest = Manifest.from_file(yaml_file)
+
     assert manifest.depends_components('examples/wifi/coexist') == ['esp_coex', 'esp_hw_support', 'esp_wifi']
 
     yaml_file.write_text(
@@ -428,7 +436,9 @@ examples/wifi/coexist:
         encoding='utf8',
     )
 
-    manifest = Manifest.from_file(yaml_file)
+    with pytest.warns(UserWarning, match='Folder ".+" does not exist. Please check your manifest file'):
+        manifest = Manifest.from_file(yaml_file)
+
     assert manifest.depends_components('examples/wifi/coexist') == ['esp_hw_support']