mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-08 04:02:27 +00:00
style: format python files with isort and double-quote-string-fixer
This commit is contained in:
@@ -7,35 +7,34 @@ import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import typing
|
||||
from abc import abstractmethod
|
||||
from collections import namedtuple
|
||||
from io import open
|
||||
|
||||
import typing
|
||||
DEFAULT_TARGET = 'esp32'
|
||||
|
||||
DEFAULT_TARGET = "esp32"
|
||||
TARGET_PLACEHOLDER = '@t'
|
||||
WILDCARD_PLACEHOLDER = '@w'
|
||||
NAME_PLACEHOLDER = '@n'
|
||||
FULL_NAME_PLACEHOLDER = '@f'
|
||||
INDEX_PLACEHOLDER = '@i'
|
||||
|
||||
TARGET_PLACEHOLDER = "@t"
|
||||
WILDCARD_PLACEHOLDER = "@w"
|
||||
NAME_PLACEHOLDER = "@n"
|
||||
FULL_NAME_PLACEHOLDER = "@f"
|
||||
INDEX_PLACEHOLDER = "@i"
|
||||
|
||||
IDF_SIZE_PY = os.path.join(os.environ["IDF_PATH"], "tools", "idf_size.py")
|
||||
IDF_SIZE_PY = os.path.join(os.environ['IDF_PATH'], 'tools', 'idf_size.py')
|
||||
SIZE_JSON_FN = 'size.json'
|
||||
|
||||
SDKCONFIG_LINE_REGEX = re.compile(r"^([^=]+)=\"?([^\"\n]*)\"?\n*$")
|
||||
|
||||
# If these keys are present in sdkconfig.defaults, they will be extracted and passed to CMake
|
||||
SDKCONFIG_TEST_OPTS = [
|
||||
"EXCLUDE_COMPONENTS",
|
||||
"TEST_EXCLUDE_COMPONENTS",
|
||||
"TEST_COMPONENTS",
|
||||
'EXCLUDE_COMPONENTS',
|
||||
'TEST_EXCLUDE_COMPONENTS',
|
||||
'TEST_COMPONENTS',
|
||||
]
|
||||
|
||||
# These keys in sdkconfig.defaults are not propagated to the final sdkconfig file:
|
||||
SDKCONFIG_IGNORE_OPTS = [
|
||||
"TEST_GROUPS"
|
||||
'TEST_GROUPS'
|
||||
]
|
||||
|
||||
# ConfigRule represents one --config argument of find_apps.py.
|
||||
@@ -45,7 +44,7 @@ SDKCONFIG_IGNORE_OPTS = [
|
||||
# For example:
|
||||
# filename='', config_name='default' — represents the default app configuration, and gives it a name 'default'
|
||||
# filename='sdkconfig.*', config_name=None - represents the set of configurations, names match the wildcard value
|
||||
ConfigRule = namedtuple("ConfigRule", ["file_name", "config_name"])
|
||||
ConfigRule = namedtuple('ConfigRule', ['file_name', 'config_name'])
|
||||
|
||||
|
||||
def config_rules_from_str(rule_strings): # type: (typing.List[str]) -> typing.List[ConfigRule]
|
||||
@@ -56,7 +55,7 @@ def config_rules_from_str(rule_strings): # type: (typing.List[str]) -> typing.L
|
||||
"""
|
||||
rules = [] # type: typing.List[ConfigRule]
|
||||
for rule_str in rule_strings:
|
||||
items = rule_str.split("=", 2)
|
||||
items = rule_str.split('=', 2)
|
||||
rules.append(ConfigRule(items[0], items[1] if len(items) == 2 else None))
|
||||
return rules
|
||||
|
||||
@@ -128,7 +127,7 @@ class BuildItem(object):
|
||||
|
||||
self.work_path = self.work_dir or self.app_dir
|
||||
if not self.build_dir:
|
||||
self.build_path = os.path.join(self.work_path, "build")
|
||||
self.build_path = os.path.join(self.work_path, 'build')
|
||||
elif os.path.isabs(self.build_dir):
|
||||
self.build_path = self.build_dir
|
||||
else:
|
||||
@@ -164,11 +163,11 @@ class BuildItem(object):
|
||||
return self._expand(self._build_log_path)
|
||||
|
||||
def __repr__(self):
|
||||
return "({}) Build app {} for target {}, sdkconfig {} in {}".format(
|
||||
return '({}) Build app {} for target {}, sdkconfig {} in {}'.format(
|
||||
self.build_system,
|
||||
self.app_dir,
|
||||
self.target,
|
||||
self.sdkconfig_path or "(default)",
|
||||
self.sdkconfig_path or '(default)',
|
||||
self.build_dir,
|
||||
)
|
||||
|
||||
@@ -189,16 +188,16 @@ class BuildItem(object):
|
||||
Internal function, called by to_json and to_json_expanded
|
||||
"""
|
||||
return json.dumps({
|
||||
"build_system": self.build_system,
|
||||
"app_dir": app_dir,
|
||||
"work_dir": work_dir,
|
||||
"build_dir": build_dir,
|
||||
"build_log_path": build_log_path,
|
||||
"sdkconfig": self.sdkconfig_path,
|
||||
"config": self.config_name,
|
||||
"target": self.target,
|
||||
"verbose": self.verbose,
|
||||
"preserve": self.preserve,
|
||||
'build_system': self.build_system,
|
||||
'app_dir': app_dir,
|
||||
'work_dir': work_dir,
|
||||
'build_dir': build_dir,
|
||||
'build_log_path': build_log_path,
|
||||
'sdkconfig': self.sdkconfig_path,
|
||||
'config': self.config_name,
|
||||
'target': self.target,
|
||||
'verbose': self.verbose,
|
||||
'preserve': self.preserve,
|
||||
})
|
||||
|
||||
@staticmethod
|
||||
@@ -208,17 +207,17 @@ class BuildItem(object):
|
||||
"""
|
||||
d = json.loads(str(json_str))
|
||||
result = BuildItem(
|
||||
app_path=d["app_dir"],
|
||||
work_dir=d["work_dir"],
|
||||
build_path=d["build_dir"],
|
||||
build_log_path=d["build_log_path"],
|
||||
sdkconfig_path=d["sdkconfig"],
|
||||
config_name=d["config"],
|
||||
target=d["target"],
|
||||
build_system=d["build_system"],
|
||||
preserve_artifacts=d["preserve"]
|
||||
app_path=d['app_dir'],
|
||||
work_dir=d['work_dir'],
|
||||
build_path=d['build_dir'],
|
||||
build_log_path=d['build_log_path'],
|
||||
sdkconfig_path=d['sdkconfig'],
|
||||
config_name=d['config'],
|
||||
target=d['target'],
|
||||
build_system=d['build_system'],
|
||||
preserve_artifacts=d['preserve']
|
||||
)
|
||||
result.verbose = d["verbose"]
|
||||
result.verbose = d['verbose']
|
||||
return result
|
||||
|
||||
def _expand(self, path): # type: (str) -> str
|
||||
@@ -233,7 +232,7 @@ class BuildItem(object):
|
||||
path = path.replace(TARGET_PLACEHOLDER, self.target)
|
||||
path = path.replace(NAME_PLACEHOLDER, self._app_name)
|
||||
if (FULL_NAME_PLACEHOLDER in path): # to avoid recursion to the call to app_dir in the next line:
|
||||
path = path.replace(FULL_NAME_PLACEHOLDER, self.app_dir.replace(os.path.sep, "_"))
|
||||
path = path.replace(FULL_NAME_PLACEHOLDER, self.app_dir.replace(os.path.sep, '_'))
|
||||
wildcard_pos = path.find(WILDCARD_PLACEHOLDER)
|
||||
if wildcard_pos != -1:
|
||||
if self.config_name:
|
||||
@@ -288,7 +287,7 @@ class BuildSystem:
|
||||
Derived classes implement the methods below.
|
||||
Objects of these classes aren't instantiated, instead the class (type object) is used.
|
||||
"""
|
||||
NAME = "undefined"
|
||||
NAME = 'undefined'
|
||||
SUPPORTED_TARGETS_REGEX = re.compile(r'Supported [Tt]argets((?:[ |]+(?:[0-9a-zA-Z\-]+))+)')
|
||||
|
||||
FORMAL_TO_USUAL = {
|
||||
@@ -307,15 +306,15 @@ class BuildSystem:
|
||||
|
||||
if work_path != app_path:
|
||||
if os.path.exists(work_path):
|
||||
logging.debug("Work directory {} exists, removing".format(work_path))
|
||||
logging.debug('Work directory {} exists, removing'.format(work_path))
|
||||
if not build_item.dry_run:
|
||||
shutil.rmtree(work_path)
|
||||
logging.debug("Copying app from {} to {}".format(app_path, work_path))
|
||||
logging.debug('Copying app from {} to {}'.format(app_path, work_path))
|
||||
if not build_item.dry_run:
|
||||
shutil.copytree(app_path, work_path)
|
||||
|
||||
if os.path.exists(build_path):
|
||||
logging.debug("Build directory {} exists, removing".format(build_path))
|
||||
logging.debug('Build directory {} exists, removing'.format(build_path))
|
||||
if not build_item.dry_run:
|
||||
shutil.rmtree(build_path)
|
||||
|
||||
@@ -328,29 +327,29 @@ class BuildSystem:
|
||||
# Note: the build system supports taking multiple sdkconfig.defaults files via SDKCONFIG_DEFAULTS
|
||||
# CMake variable. However here we do this manually to perform environment variable expansion in the
|
||||
# sdkconfig files.
|
||||
sdkconfig_defaults_list = ["sdkconfig.defaults", "sdkconfig.defaults." + build_item.target]
|
||||
sdkconfig_defaults_list = ['sdkconfig.defaults', 'sdkconfig.defaults.' + build_item.target]
|
||||
if build_item.sdkconfig_path:
|
||||
sdkconfig_defaults_list.append(build_item.sdkconfig_path)
|
||||
|
||||
sdkconfig_file = os.path.join(work_path, "sdkconfig")
|
||||
sdkconfig_file = os.path.join(work_path, 'sdkconfig')
|
||||
if os.path.exists(sdkconfig_file):
|
||||
logging.debug("Removing sdkconfig file: {}".format(sdkconfig_file))
|
||||
logging.debug('Removing sdkconfig file: {}'.format(sdkconfig_file))
|
||||
if not build_item.dry_run:
|
||||
os.unlink(sdkconfig_file)
|
||||
|
||||
logging.debug("Creating sdkconfig file: {}".format(sdkconfig_file))
|
||||
logging.debug('Creating sdkconfig file: {}'.format(sdkconfig_file))
|
||||
extra_cmakecache_items = {}
|
||||
if not build_item.dry_run:
|
||||
with open(sdkconfig_file, "w") as f_out:
|
||||
with open(sdkconfig_file, 'w') as f_out:
|
||||
for sdkconfig_name in sdkconfig_defaults_list:
|
||||
sdkconfig_path = os.path.join(work_path, sdkconfig_name)
|
||||
if not sdkconfig_path or not os.path.exists(sdkconfig_path):
|
||||
continue
|
||||
logging.debug("Appending {} to sdkconfig".format(sdkconfig_name))
|
||||
with open(sdkconfig_path, "r") as f_in:
|
||||
logging.debug('Appending {} to sdkconfig'.format(sdkconfig_name))
|
||||
with open(sdkconfig_path, 'r') as f_in:
|
||||
for line in f_in:
|
||||
if not line.endswith("\n"):
|
||||
line += "\n"
|
||||
if not line.endswith('\n'):
|
||||
line += '\n'
|
||||
if cls.NAME == 'cmake':
|
||||
m = SDKCONFIG_LINE_REGEX.match(line)
|
||||
key = m.group(1) if m else None
|
||||
@@ -365,10 +364,10 @@ class BuildSystem:
|
||||
sdkconfig_path = os.path.join(app_path, sdkconfig_name)
|
||||
if not sdkconfig_path:
|
||||
continue
|
||||
logging.debug("Considering sdkconfig {}".format(sdkconfig_path))
|
||||
logging.debug('Considering sdkconfig {}'.format(sdkconfig_path))
|
||||
if not os.path.exists(sdkconfig_path):
|
||||
continue
|
||||
logging.debug("Appending {} to sdkconfig".format(sdkconfig_name))
|
||||
logging.debug('Appending {} to sdkconfig'.format(sdkconfig_name))
|
||||
|
||||
# The preparation of build is finished. Implement the build part in sub classes.
|
||||
if cls.NAME == 'cmake':
|
||||
@@ -409,7 +408,7 @@ class BuildSystem:
|
||||
readme_path = get_md_or_rst(os.path.dirname(app_path))
|
||||
if not readme_path:
|
||||
return None
|
||||
with open(readme_path, "r", encoding='utf8') as readme_file:
|
||||
with open(readme_path, 'r', encoding='utf8') as readme_file:
|
||||
return readme_file.read()
|
||||
|
||||
@classmethod
|
||||
@@ -460,7 +459,7 @@ def setup_logging(args):
|
||||
log_level = logging.DEBUG
|
||||
|
||||
logging.basicConfig(
|
||||
format="%(levelname)s: %(message)s",
|
||||
format='%(levelname)s: %(message)s',
|
||||
stream=args.log_file or sys.stderr,
|
||||
level=log_level,
|
||||
)
|
||||
|
Reference in New Issue
Block a user