idf-build-apps 2.13.1__tar.gz → 2.13.2__tar.gz

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## v2.13.2 (2025-10-23)
+
+### 🐛 Bug Fixes
+
+- update broken tests for `size.json` *(Evgeny Torbin - c603221)*
+- change `idf_size.py --format json` to `--format json2` *(Evgeny Torbin - 49b9f3d)*
+
+
 ## v2.13.1 (2025-09-29)
 
 ### 🐛 Bug Fixes

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/PKG-INFO

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

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/idf_build_apps/__init__.py

@@ -8,7 +8,7 @@ Tools for building ESP-IDF related apps.
 # ruff: noqa: E402
 # avoid circular imports
 
-__version__ = '2.13.1'
+__version__ = '2.13.2'
 
 from .session_args import (
     SessionArgs,

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/idf_build_apps/app.py

@@ -642,11 +642,28 @@ class App(BaseModel):
             return
 
         if IDF_VERSION >= Version('4.1'):
+            """
+            Starting from version 2.0.0 esp-idf-size uses new generation (NG) implementation.
+            In newest version `--format json` was changed to `--format json2`.
+            For different versions of IDF there are 4 scenarios:
+
+            1. 6.0 - NG is enforced until version 2.x will be fully incorporated.
+            2. >=5.3 <=5.5 - NG is enabled by default, but could be disabled using `-l/--legacy` argument.
+            3. 5.1 and 5.2 - only legacy mode is supported.
+            4. <5.1 - esp-idf-size package is not used, only `--json` argument is supported.
+            """
+            if IDF_VERSION >= Version('5.3'):
+                format_arg = ['--format', 'json2']
+            elif IDF_VERSION >= Version('5.1'):
+                format_arg = ['--format', 'json']
+            else:
+                format_arg = ['--json']
+
             subprocess_run(
                 [
                     sys.executable,
                     str(IDF_SIZE_PY),
-                    *(['--json'] if IDF_VERSION < Version('5.1') else ['--format', 'json']),
+                    *(format_arg),
                     '-o',
                     self.size_json_path,
                     *(self.size_json_extra_args or []),

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/idf_build_apps/args.py

@@ -145,6 +145,7 @@ class BaseArguments(BaseSettings):
         # these below two are supported in pydantic 2.6
         pyproject_toml_table_header=('tool', 'idf-build-apps'),
         pyproject_toml_depth=sys.maxsize,
+        validate_default=True,
         extra='ignore',  # we're supporting pydantic <2.6 as well, so we ignore extra fields
     )
 

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/idf_build_apps/main.py

@@ -396,6 +396,9 @@ def main():
         Manifest.from_files(arguments.manifest_files).dump_sha_values(arguments.output)
         sys.exit(0)
     elif action == 'find':
+        print('reinstall idf-build-apps')
+        print(kwargs['paths'])
+
         arguments = FindArguments(**drop_none_kwargs(kwargs))
     else:
         arguments = BuildArguments(**drop_none_kwargs(kwargs))

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/pyproject.toml

@@ -65,7 +65,7 @@ idf-build-apps = "idf_build_apps:main.main"
 
 [tool.commitizen]
 name = "czespressif"
-version = "2.13.1"
+version = "2.13.2"
 
 tag_format = "v$version"
 version_scheme = "pep440"

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/setup.py

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

{idf_build_apps-2.13.1 → idf_build_apps-2.13.2}/tests/test_build.py

@@ -223,9 +223,13 @@ class TestBuild:
         with open(app.size_json_path) as f:
             size_data = json.load(f)
 
-        expected_keys = ['dram_data', 'dram_bss', 'used_dram', 'iram_text', 'flash_code', 'total_size']
-        for key in expected_keys:
-            assert key in size_data, f"Size JSON should contain '{key}' when no extra args"
+        expected_names = ['Flash Code', 'IRAM', 'Flash Data', 'DRAM', 'RTC SLOW']
+
+        assert 'layout' in size_data
+        size_data_names = [name_info['name'] for name_info in size_data['layout']]
+
+        for name in expected_names:
+            assert name in size_data_names, f"Size JSON layout should contain '{name}' when no extra args"
 
     def test_build_with_size_json_with_extra_args(self, tmp_path):
         """Test idf_size_py with extra args."""
@@ -247,14 +251,16 @@ class TestBuild:
         with open(app.size_json_path) as f:
             size_data = json.load(f)
 
-        expected_keys = [
+        expected_files = [
             'libesp_timer.a:system_time.c.obj',
             'libc.a:libc_a-vfprintf.o',
             'libfreertos.a:tasks.c.obj',
             'libheap.a:tlsf.c.obj',
         ]
-        for key in expected_keys:
-            assert key in size_data, f"Size JSON should contain '{key}' with extra args"
+
+        size_data_files = size_data.keys()
+        for file in expected_files:
+            assert any(file in s for s in size_data_files), f"Size JSON should contain '{file}' with extra args"
 
 
 class CustomClassApp(App):