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

Misc fixes for flake8/mypy

Browse source
This commit is contained in:
Alexandre Aubin 2024-06-23 01:05:39 +02:00
parent be3df69326
commit 31ae5d1eaa
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/log.py
View file

@ -77,7 +77,7 @@ BORING_LOG_LINES = [
r"DEBUG - \+\+ app=\S+$", r"DEBUG - \+\+ app=\S+$",
r"DEBUG - \+\+ jq -r .\S+$", r"DEBUG - \+\+ jq -r .\S+$",
r"DEBUG - \+\+ sed 's/\^null\$//'$", r"DEBUG - \+\+ sed 's/\^null\$//'$",
"DEBUG - \\+ sed --in-place \$'s\\\\001", "DEBUG - \\+ sed --in-place \\$'s\\\\001",
"DEBUG - \\+ sed --in-place 's\u0001.*$", "DEBUG - \\+ sed --in-place 's\u0001.*$",
] ]

20
src/utils/resources.py
View file

@ -156,29 +156,29 @@ class AppResource:
app_upstream_version = manager.current["version"].split("~")[0] app_upstream_version = manager.current["version"].split("~")[0]
# FIXME : should use packaging.version to properly parse / compare versions >_> # FIXME : should use packaging.version to properly parse / compare versions >_>
self.helpers_version = None self.helpers_version: float = 0
if ( if (
manager manager
and manager.wanted and manager.wanted
and manager.wanted.get("integration", {}).get("helpers_version") and manager.wanted.get("integration", {}).get("helpers_version")
): ):
self.helpers_version = manager.wanted.get("integration", {}).get( self.helpers_version = float(manager.wanted.get("integration", {}).get(
"helpers_version" "helpers_version"
) ))
elif ( elif (
manager manager
and manager.current and manager.current
and manager.current.get("integration", {}).get("helpers_version") and manager.current.get("integration", {}).get("helpers_version")
): ):
self.helpers_version = manager.current.get("integration", {}).get( self.helpers_version = float(manager.current.get("integration", {}).get(
"helpers_version" "helpers_version"
) ))
elif manager and manager.wanted and manager.wanted.get("packaging_format"): elif manager and manager.wanted and manager.wanted.get("packaging_format"):
self.helpers_version = str(manager.wanted.get("packaging_format")) self.helpers_version = float(manager.wanted.get("packaging_format"))
elif manager and manager.current and manager.current.get("packaging_format"): elif manager and manager.current and manager.current.get("packaging_format"):
self.helpers_version = str(manager.current.get("packaging_format")) self.helpers_version = float(manager.current.get("packaging_format"))
if not self.helpers_version: if not self.helpers_version:
self.helpers_version = "1" self.helpers_version = 1.0
replacements: dict[str, str] = { replacements: dict[str, str] = {
"__APP__": self.app, "__APP__": self.app,
@ -1208,7 +1208,7 @@ class AptDependenciesAppResource(AppResource):
def provision_or_update(self, context: Dict = {}): def provision_or_update(self, context: Dict = {}):
if float(self.helpers_version) >= 2.1: if self.helpers_version >= 2.1:
ynh_apt_install_dependencies = "ynh_apt_install_dependencies" ynh_apt_install_dependencies = "ynh_apt_install_dependencies"
ynh_apt_install_dependencies_from_extra_repository = ( ynh_apt_install_dependencies_from_extra_repository = (
"ynh_apt_install_dependencies_from_extra_repository" "ynh_apt_install_dependencies_from_extra_repository"
@ -1234,7 +1234,7 @@ class AptDependenciesAppResource(AppResource):
self._run_script("provision_or_update", script) self._run_script("provision_or_update", script)
def deprovision(self, context: Dict = {}): def deprovision(self, context: Dict = {}):
if float(self.helpers_version) >= 2.1: if self.helpers_version >= 2.1
ynh_apt_remove_dependencies = "ynh_apt_remove_dependencies" ynh_apt_remove_dependencies = "ynh_apt_remove_dependencies"
else: else:
ynh_apt_remove_dependencies = "ynh_remove_app_dependencies" ynh_apt_remove_dependencies = "ynh_remove_app_dependencies"