From 31ae5d1eaaff3e1865f80740de225c510b514eb4 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 23 Jun 2024 01:05:39 +0200
Subject: [PATCH] Misc fixes for flake8/mypy

---
 src/log.py             |  2 +-
 src/utils/resources.py | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/log.py b/src/log.py
index 45dc884fc..7950fca78 100755
--- a/src/log.py
+++ b/src/log.py
@@ -77,7 +77,7 @@ BORING_LOG_LINES = [
     r"DEBUG - \+\+ app=\S+$",
     r"DEBUG - \+\+ jq -r .\S+$",
     r"DEBUG - \+\+ sed 's/\^null\$//'$",
-    "DEBUG - \\+ sed --in-place \$'s\\\\001",
+    "DEBUG - \\+ sed --in-place \\$'s\\\\001",
     "DEBUG - \\+ sed --in-place 's\u0001.*$",
 ]
 
diff --git a/src/utils/resources.py b/src/utils/resources.py
index b408fde47..c0a7404e2 100644
--- a/src/utils/resources.py
+++ b/src/utils/resources.py
@@ -156,29 +156,29 @@ class AppResource:
             app_upstream_version = manager.current["version"].split("~")[0]
 
         # FIXME : should use packaging.version to properly parse / compare versions >_>
-        self.helpers_version = None
+        self.helpers_version: float = 0
         if (
             manager
             and manager.wanted
             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"
-            )
+            ))
         elif (
             manager
             and manager.current
             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"
-            )
+            ))
         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"):
-            self.helpers_version = str(manager.current.get("packaging_format"))
+            self.helpers_version = float(manager.current.get("packaging_format"))
         if not self.helpers_version:
-            self.helpers_version = "1"
+            self.helpers_version = 1.0
 
         replacements: dict[str, str] = {
             "__APP__": self.app,
@@ -1208,7 +1208,7 @@ class AptDependenciesAppResource(AppResource):
 
     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_from_extra_repository = (
                 "ynh_apt_install_dependencies_from_extra_repository"
@@ -1234,7 +1234,7 @@ class AptDependenciesAppResource(AppResource):
         self._run_script("provision_or_update", script)
 
     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"
         else:
             ynh_apt_remove_dependencies = "ynh_remove_app_dependencies"