Replace using semver

Author: bouwew

plugwise/__init__.py

@@ -31,10 +31,6 @@
 import aiohttp
 from defusedxml import ElementTree as etree
 
-# Dict as class
-# Version detection
-import semver
-
 
 class Smile(SmileComm):
     """The Plugwise SmileConnect class."""
@@ -88,7 +84,7 @@ def __init__(
         self.smile_model: str
         self.smile_name: str
         self.smile_type: str
-        self.smile_version: tuple[str, semver.version.Version]
+        self.smile_version: str
         self.smile_zigbee_mac_address: str | None = None
 
     async def connect(self) -> bool:
@@ -207,8 +203,8 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
             )
             raise UnsupportedDeviceError
 
-        ver = semver.version.Version.parse(self.smile_fw_version)
-        self._target_smile = f"{model}_v{ver.major}"
+        version_major: str = self.smile_fw_version.split(".", 1)[0]
+        self._target_smile = f"{model}_v{version_major}"
         LOGGER.debug("Plugwise identified as %s", self._target_smile)
         if self._target_smile not in SMILES:
             LOGGER.error(
@@ -228,10 +224,10 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
         self.smile_model = "Gateway"
         self.smile_name = SMILES[self._target_smile].smile_name
         self.smile_type = SMILES[self._target_smile].smile_type
-        self.smile_version = (self.smile_fw_version, ver)
+        self.smile_version = self.smile_fw_version
 
         if self.smile_type == "stretch":
-            self._stretch_v2 = self.smile_version[1].major == 2
+            self._stretch_v2 = int(version_major) == 2
 
         if self.smile_type == "thermostat":
             self._is_thermostat = True

plugwise/legacy/smile.py

@@ -29,7 +29,6 @@
 
 import aiohttp
 from munch import Munch
-import semver
 
 
 class SmileLegacyAPI(SmileComm, SmileLegacyData):
@@ -55,7 +54,7 @@ def __init__(
         smile_model: str,
         smile_name: str,
         smile_type: str,
-        smile_version: tuple[str, semver.version.Version],
+        smile_version: str,
         smile_zigbee_mac_address: str | None,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,

plugwise/smile.py

@@ -35,9 +35,6 @@
 # Dict as class
 from munch import Munch
 
-# Version detection
-import semver
-
 
 class SmileAPI(SmileComm, SmileData):
     """The Plugwise SmileAPI helper class for actual Plugwise devices."""
@@ -66,7 +63,7 @@ def __init__(
         smile_model: str,
         smile_name: str,
         smile_type: str,
-        smile_version: tuple[str, semver.version.Version],
+        smile_version: str,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
         timeout: float = DEFAULT_TIMEOUT,

tests/test_init.py

@@ -942,7 +942,7 @@ def validate_test_basics(
         if smile_version:
             log_msg = f" # Assert version matching '{smile_version}"
             parent_logger.info(log_msg)
-            assert smile.smile_version[0] == smile_version
+            assert smile.smile_version == smile_version
         if smile_version:
             log_msg = f" # Assert legacy {smile_legacy}"
             parent_logger.info(log_msg)