Merge branch 'fz-dev' into dev

scripts/fbt_tools/ccache.py

@@ -3,7 +3,7 @@ def exists():
 
 
 def generate(env):
-    if ccache := env.WhereIs("ccache"):
+    if env.WhereIs("ccache"):
         env["CCACHE"] = "ccache"
         env["CC_NOCACHE"] = env["CC"]
         env["CC"] = "$CCACHE $CC_NOCACHE"

scripts/fbt_tools/crosscc.py

@@ -1,15 +1,11 @@
-from SCons.Errors import StopError
-from SCons.Tool import asm
-from SCons.Tool import gcc
-from SCons.Tool import gxx
-from SCons.Tool import ar
-from SCons.Tool import gnulink
-import strip
+import subprocess
+
 import gdb
 import objdump
-
+import strip
 from SCons.Action import _subproc
-import subprocess
+from SCons.Errors import StopError
+from SCons.Tool import ar, asm, gcc, gnulink, gxx
 
 
 def prefix_commands(env, command_prefix, cmd_list):

scripts/fbt_tools/fbt_apps.py

@@ -1,15 +1,14 @@
-from SCons.Builder import Builder
-from SCons.Action import Action
-from SCons.Errors import StopError
-from SCons.Warnings import warn, WarningOnByDefault
 from ansi.color import fg
-
 from fbt.appmanifest import (
-    FlipperAppType,
-    AppManager,
     ApplicationsCGenerator,
+    AppManager,
+    FlipperAppType,
     FlipperManifestException,
 )
+from SCons.Action import Action
+from SCons.Builder import Builder
+from SCons.Errors import StopError
+from SCons.Warnings import WarningOnByDefault, warn
 
 # Adding objects for application management to env
 #  AppManager env["APPMGR"] - loads all manifests; manages list of known apps

scripts/fbt_tools/fbt_assets.py

@@ -1,10 +1,10 @@
-from SCons.Builder import Builder
-from SCons.Action import Action
-from SCons.Errors import StopError
-
 import os
 import subprocess
+
 from ansi.color import fg
+from SCons.Action import Action
+from SCons.Builder import Builder
+from SCons.Errors import StopError
 
 
 def icons_emitter(target, source, env):
@@ -76,11 +76,11 @@ def proto_ver_generator(target, source, env):
     target_file = target[0]
     src_dir = source[0].dir.abspath
     try:
-        git_fetch = _invoke_git(
+        _invoke_git(
             ["fetch", "--tags"],
             source_dir=src_dir,
         )
-    except (subprocess.CalledProcessError, EnvironmentError) as e:
+    except (subprocess.CalledProcessError, EnvironmentError):
         # Not great, not terrible
         print(fg.boldred("Git: fetch failed"))
 
@@ -89,7 +89,7 @@ def proto_ver_generator(target, source, env):
             ["describe", "--tags", "--abbrev=0"],
             source_dir=src_dir,
         )
-    except (subprocess.CalledProcessError, EnvironmentError) as e:
+    except (subprocess.CalledProcessError, EnvironmentError):
         raise StopError("Git: describe failed")
 
     git_major, git_minor = git_describe.split(".")

scripts/fbt_tools/fbt_debugopts.py

@@ -1,5 +1,3 @@
-from re import search
-
 from SCons.Errors import UserError
 
 

scripts/fbt_tools/fbt_dist.py

@@ -1,6 +1,5 @@
-from SCons.Builder import Builder
 from SCons.Action import Action
-from SCons.Script import Mkdir
+from SCons.Builder import Builder
 from SCons.Defaults import Touch
 
 

scripts/fbt_tools/fbt_extapps.py

@@ -3,23 +3,19 @@ import os
 import pathlib
 import shutil
 from dataclasses import dataclass, field
-from typing import Optional, TypedDict
-
-from ansi.color import fg
+from typing import Optional
 
 import SCons.Warnings
-from SCons.Action import Action
-from SCons.Builder import Builder
-from SCons.Errors import UserError
-from SCons.Node import NodeList
-from SCons.Node.FS import File, Entry
-
+from ansi.color import fg
 from fbt.appmanifest import FlipperApplication, FlipperAppType, FlipperManifestException
 from fbt.elfmanifest import assemble_manifest_data
 from fbt.fapassets import FileBundler
 from fbt.sdk.cache import SdkCache
 from fbt.util import extract_abs_dir_path
-
+from SCons.Action import Action
+from SCons.Builder import Builder
+from SCons.Errors import UserError
+from SCons.Node.FS import Entry, File
 
 _FAP_META_SECTION = ".fapmeta"
 _FAP_FILEASSETS_SECTION = ".fapassets"
@@ -289,7 +285,7 @@ def GetExtAppByIdOrPath(env, app_dir):
     try:
         # Maybe user passed an appid?
         app = appmgr.get(app_dir)
-    except FlipperManifestException as _:
+    except FlipperManifestException:
         # Look up path components in known app dirs
         for dir_part in reversed(pathlib.Path(app_dir).parts):
             if app := appmgr.find_by_appdir(dir_part):

scripts/fbt_tools/fbt_hwtarget.py

@@ -1,5 +1,3 @@
-from SCons.Builder import Builder
-from SCons.Action import Action
 import json
 
 

scripts/fbt_tools/fbt_sdk.py

@@ -1,21 +1,20 @@
+import json
+import os.path
+import pathlib
+import posixpath
 import shutil
-from SCons.Builder import Builder
+
+from fbt.sdk.cache import SdkCache
+from fbt.sdk.collector import SdkCollector
+from fbt.util import path_as_posix
 from SCons.Action import Action
+from SCons.Builder import Builder
 from SCons.Errors import UserError
 
 # from SCons.Scanner import C
 from SCons.Script import Entry
 from SCons.Util import LogicalLines
 
-import os.path
-import posixpath
-import pathlib
-import json
-
-from fbt.sdk.collector import SdkCollector
-from fbt.sdk.cache import SdkCache
-from fbt.util import path_as_posix
-
 
 def ProcessSdkDepends(env, filename):
     try:

scripts/fbt_tools/fbt_tweaks.py

@@ -1,15 +1,13 @@
+import os
+import sys
+import traceback
+
 import SCons.Warnings as Warnings
+from ansi.color import fg
 from SCons.Errors import UserError
 
-
 # from SCons.Script.Main import find_deepest_user_frame
 
-from ansi.color import fg, bg, fx
-
-import traceback
-import sys
-import os
-
 
 def find_deepest_user_frame(tb):
     tb.reverse()

scripts/fbt_tools/fbt_version.py

@@ -1,5 +1,5 @@
-from SCons.Builder import Builder
 from SCons.Action import Action
+from SCons.Builder import Builder
 
 
 def version_emitter(target, source, env):

scripts/fbt_tools/fwbin.py

@@ -1,6 +1,6 @@
-from SCons.Builder import Builder
-from SCons.Action import Action
 import SCons
+from SCons.Action import Action
+from SCons.Builder import Builder
 
 __OBJCOPY_ARM_BIN = "arm-none-eabi-objcopy"
 __NM_ARM_BIN = "arm-none-eabi-nm"

scripts/fbt_tools/gdb.py

@@ -1,7 +1,3 @@
-from SCons.Builder import Builder
-from SCons.Action import Action
-
-
 def generate(env):
     env.SetDefault(
         GDB="gdb",

scripts/fbt_tools/objdump.py

@@ -1,5 +1,5 @@
-from SCons.Builder import Builder
 from SCons.Action import Action
+from SCons.Builder import Builder
 
 
 def generate(env):

scripts/fbt_tools/openocd.py

@@ -1,7 +1,7 @@
-from SCons.Builder import Builder
-from SCons.Action import Action
-from SCons.Defaults import Touch
 import SCons
+from SCons.Action import Action
+from SCons.Builder import Builder
+from SCons.Defaults import Touch
 
 __OPENOCD_BIN = "openocd"
 

scripts/fbt_tools/pvsstudio.py

@@ -1,11 +1,12 @@
-from SCons.Builder import Builder
-from SCons.Action import Action
-from SCons.Script import Delete, Mkdir, GetBuildFailures, Flatten
-import multiprocessing
-import webbrowser
 import atexit
-import sys
+import multiprocessing
 import subprocess
+import sys
+import webbrowser
+
+from SCons.Action import Action
+from SCons.Builder import Builder
+from SCons.Script import Delete, Flatten, GetBuildFailures, Mkdir
 
 __no_browser = False
 

scripts/fbt_tools/sconsmodular.py

@@ -1,5 +1,6 @@
-import posixpath
 import os
+import posixpath
+
 from SCons.Errors import UserError
 
 

scripts/fbt_tools/sconsrecursiveglob.py

@@ -1,6 +1,6 @@
 import SCons
-from SCons.Script import Flatten
 from fbt.util import GLOB_FILE_EXCLUSION
+from SCons.Script import Flatten
 
 
 def GlobRecursive(env, pattern, node=".", exclude=[]):

scripts/fbt_tools/strip.py

@@ -1,5 +1,5 @@
-from SCons.Builder import Builder
 from SCons.Action import Action
+from SCons.Builder import Builder
 
 
 def generate(env):