[Deps] use packaging.version

Author: Guillaume De Saint Martin

octobot/cli.py

@@ -14,7 +14,7 @@
 #  You should have received a copy of the GNU General Public
 #  License along with OctoBot. If not, see <https://www.gnu.org/licenses/>.
 
-from distutils.version import LooseVersion
+import packaging.version as packaging_version
 
 import argparse
 import os
@@ -399,7 +399,7 @@ def main(args=None):
     try:
         from octobot_tentacles_manager import VERSION
 
-        if LooseVersion(VERSION) < MIN_TENTACLE_MANAGER_VERSION:
+        if packaging_version.Version(VERSION) < packaging_version.Version(MIN_TENTACLE_MANAGER_VERSION):
             print("OctoBot requires OctoBot-Tentacles-Manager in a minimum version of " + MIN_TENTACLE_MANAGER_VERSION +
                   " you can install and update OctoBot-Tentacles-Manager using the following command: "
                   "python3 -m pip install -U OctoBot-Tentacles-Manager", file=sys.stderr)

octobot/community/feeds/community_mqtt_feed.py

@@ -13,13 +13,12 @@
 #
 #  You should have received a copy of the GNU General Public
 #  License along with OctoBot. If not, see <https://www.gnu.org/licenses/>.
-import time
 import uuid
 import gmqtt
 import json
 import zlib
 import asyncio
-import distutils.version as loose_version
+import packaging.version as packaging_version
 
 import octobot_commons.enums as commons_enums
 import octobot_commons.errors as commons_errors
@@ -182,8 +181,8 @@ def _build_message(self, channel_type, message):
         return {}
 
     def _ensure_supported(self, parsed_message):
-        if loose_version.LooseVersion(parsed_message[commons_enums.CommunityFeedAttrs.VERSION.value]) \
-                < loose_version.LooseVersion(constants.COMMUNITY_FEED_CURRENT_MINIMUM_VERSION):
+        if packaging_version.Version(parsed_message[commons_enums.CommunityFeedAttrs.VERSION.value]) \
+                < packaging_version.Version(constants.COMMUNITY_FEED_CURRENT_MINIMUM_VERSION):
             raise commons_errors.UnsupportedError(
                 f"Minimum version: {constants.COMMUNITY_FEED_CURRENT_MINIMUM_VERSION}"
             )

octobot/community/feeds/community_ws_feed.py

@@ -20,7 +20,7 @@
 import asyncio
 import enum
 import json
-import distutils.version as loose_version
+import packaging.version as packaging_version
 
 import octobot_commons.errors as commons_errors
 import octobot_commons.enums as commons_enums
@@ -119,8 +119,8 @@ async def consume(self, message):
             self.logger.error(f"Unsupported message: {e}")
 
     def _ensure_supported(self, parsed_message):
-        if loose_version.LooseVersion(parsed_message[commons_enums.CommunityFeedAttrs.VERSION.value]) \
-                < loose_version.LooseVersion(constants.COMMUNITY_FEED_CURRENT_MINIMUM_VERSION):
+        if packaging_version.Version(parsed_message[commons_enums.CommunityFeedAttrs.VERSION.value]) \
+                < packaging_version.Version(constants.COMMUNITY_FEED_CURRENT_MINIMUM_VERSION):
             raise commons_errors.UnsupportedError(
                 f"Minimum version: {constants.COMMUNITY_FEED_CURRENT_MINIMUM_VERSION}"
             )

requirements.txt

@@ -16,6 +16,7 @@ colorlog==4.7.2
 yarl==1.7.2
 idna<2.9,>=2.5
 requests==2.25.1
+packaging==21.3
 
 # Community
 websockets