YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[CI] Format code with Black

Browse source
This commit is contained in:
yunohost-bot 2023-11-24 21:53:33 +00:00
parent 5746b94dff
commit ce0cbc5fed
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/backup.py
View file

@ -1556,9 +1556,7 @@ class RestoreManager:
operation_logger.success() operation_logger.success()
# Call post_app_restore hook # Call post_app_restore hook
env_dict = _make_environment_for_app_script( env_dict = _make_environment_for_app_script(app_instance_name)
app_instance_name
)
hook_callback("post_app_restore", env=env_dict) hook_callback("post_app_restore", env=env_dict)
else: else:
self.targets.set_result("apps", app_instance_name, "Error") self.targets.set_result("apps", app_instance_name, "Error")

9
src/utils/configpanel.py
View file

@ -352,7 +352,14 @@ class ConfigPanel:
}, },
}, },
"sections": { "sections": {
"properties": ["name", "services", "optional", "help", "visible", "bind"], "properties": [
"name",
"services",
"optional",
"help",
"visible",
"bind",
],
"defaults": { "defaults": {
"name": "", "name": "",
"services": [], "services": [],

4
src/utils/form.py
View file

@ -941,7 +941,9 @@ class UserOption(BaseChoicesOption):
super().__init__(question) super().__init__(question)
users = user_list(fields = ["username", "fullname", "mail", "mail-alias"])["users"] users = user_list(fields=["username", "fullname", "mail", "mail-alias"])[
"users"
]
self.choices = { self.choices = {
username: f"{infos['fullname']} ({infos['mail']})" username: f"{infos['fullname']} ({infos['mail']})"

9
src/utils/resources.py
View file

@ -1086,6 +1086,7 @@ class AptDependenciesAppResource(AppResource):
packages: List = [] packages: List = []
packages_from_raw_bash: str = "" packages_from_raw_bash: str = ""
extras: Dict[str, Dict[str, Union[str, List]]] = {} extras: Dict[str, Dict[str, Union[str, List]]] = {}
def __init__(self, properties: Dict[str, Any], *args, **kwargs): def __init__(self, properties: Dict[str, Any], *args, **kwargs):
super().__init__(properties, *args, **kwargs) super().__init__(properties, *args, **kwargs)
@ -1106,7 +1107,9 @@ class AptDependenciesAppResource(AppResource):
values["packages"] = [value.strip() for value in values["packages"].split(",")] # type: ignore values["packages"] = [value.strip() for value in values["packages"].split(",")] # type: ignore
if isinstance(values.get("packages_from_raw_bash"), str): if isinstance(values.get("packages_from_raw_bash"), str):
out, err = self.check_output_bash_snippet(values.get("packages_from_raw_bash")) out, err = self.check_output_bash_snippet(
values.get("packages_from_raw_bash")
)
if err: if err:
logger.error( logger.error(
f"Error while running apt resource packages_from_raw_bash snippet for '{key}' extras:" f"Error while running apt resource packages_from_raw_bash snippet for '{key}' extras:"
@ -1125,7 +1128,9 @@ class AptDependenciesAppResource(AppResource):
) )
# Drop 'extras' entries associated to no packages # Drop 'extras' entries associated to no packages
self.extras = {key: values for key, values in self.extras.items() if values["packages"]} self.extras = {
key: values for key, values in self.extras.items() if values["packages"]
}
def provision_or_update(self, context: Dict = {}): def provision_or_update(self, context: Dict = {}):
script = " ".join(["ynh_install_app_dependencies", *self.packages]) script = " ".join(["ynh_install_app_dependencies", *self.packages])