fix: use relative SESSION_ARGS import

espressif · Dec 1, 2023 · b91d3ed · b91d3ed
1 parent 63df3b0
commit b91d3ed
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/idf_build_apps/app.py b/idf_build_apps/app.py
@@ -31,7 +31,9 @@
     computed_field,
 )
 
-import idf_build_apps
+from idf_build_apps import (
+    SESSION_ARGS,
+)
 
 from . import (
     LOGGER,
@@ -382,12 +384,10 @@ def _process_sdkconfig_files(self):
         except OSError:
             pass
 
-        if idf_build_apps.SESSION_ARGS.override_sdkconfig_items:
-            res.append(idf_build_apps.SESSION_ARGS.override_sdkconfig_file_path)
-            if 'CONFIG_IDF_TARGET' in idf_build_apps.SESSION_ARGS.override_sdkconfig_items:
-                self._sdkconfig_files_defined_target = idf_build_apps.SESSION_ARGS.override_sdkconfig_items[
-                    'CONFIG_IDF_TARGET'
-                ]
+        if SESSION_ARGS.override_sdkconfig_items:
+            res.append(SESSION_ARGS.override_sdkconfig_file_path)
+            if 'CONFIG_IDF_TARGET' in SESSION_ARGS.override_sdkconfig_items:
+                self._sdkconfig_files_defined_target = SESSION_ARGS.override_sdkconfig_items['CONFIG_IDF_TARGET']
 
         self._sdkconfig_files = res
 

diff --git a/idf_build_apps/session_args.py b/idf_build_apps/session_args.py
@@ -16,6 +16,10 @@ def set(self, parsed_args, *, workdir=None):
             self.workdir = workdir
         self._setup_override_sdkconfig(parsed_args)
 
+    def clean(self):
+        self.override_sdkconfig_items = {}
+        self.override_sdkconfig_file_path = None
+
     def _setup_override_sdkconfig(self, args):
         override_sdkconfig_items = self._get_override_sdkconfig_items(
             args.override_sdkconfig_items.split(',') if args.override_sdkconfig_items else ()
@@ -24,10 +28,10 @@ def _setup_override_sdkconfig(self, args):
             args.override_sdkconfig_files.split(',') if args.override_sdkconfig_files else ()
         )
 
-        override_sdkconfig_merged_items = override_sdkconfig_files_items.update(override_sdkconfig_items)
-        self.override_sdkconfig_items = override_sdkconfig_merged_items
+        override_sdkconfig_files_items.update(override_sdkconfig_items)
+        self.override_sdkconfig_items = override_sdkconfig_files_items
 
-        override_sdkconfig_merged_file = self._create_override_sdkconfig_merged_file(override_sdkconfig_merged_items)
+        override_sdkconfig_merged_file = self._create_override_sdkconfig_merged_file(self.override_sdkconfig_items)
         self.override_sdkconfig_file_path = override_sdkconfig_merged_file
 
     def _get_override_sdkconfig_files_items(self, override_sdkconfig_files: t.Tuple[str]) -> t.Dict:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -7,15 +7,14 @@
 import idf_build_apps
 from idf_build_apps import (
     App,
-    session_args,
     setup_logging,
 )
 
 
 @pytest.fixture(autouse=True)
 def clean_cls_attr():
     App.MANIFEST = None
-    idf_build_apps.SESSION_ARGS = session_args.SessionArgs()
+    idf_build_apps.SESSION_ARGS.clean()
 
 
 @pytest.fixture(autouse=True)