Merge pull request #2116 from tchaikov/wip-drop-distutils

teuthology: remove dependency on distutils

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Author: tchaikov

teuthology/describe_tests.py

@@ -8,12 +8,11 @@
 import yaml
 
 import random
-from distutils.util import strtobool
-
 from teuthology.exceptions import ParseError
 from teuthology.suite.build_matrix import \
         build_matrix, generate_combinations, _get_matrix
 from teuthology.suite import util, merge
+from teuthology.util.strtobool import strtobool
 
 def main(args):
     try:

teuthology/suite/__init__.py

@@ -7,7 +7,6 @@
 import random
 import sys
 import time
-from distutils.util import strtobool
 
 import teuthology
 from teuthology.config import config, YamlConfig
@@ -16,6 +15,7 @@
 
 from teuthology.suite.run import Run
 from teuthology.suite.util import schedule_fail
+from teuthology.util.strtobool import strtobool
 
 log = logging.getLogger(__name__)
 

teuthology/task/install/__init__.py

@@ -10,12 +10,12 @@
 from teuthology.parallel import parallel
 from teuthology.task import ansible
 
-from distutils.version import LooseVersion
 from teuthology.task.install.util import (
     _get_builder_project, get_flavor, ship_utilities,
 )
 
 from teuthology.task.install import rpm, deb, redhat
+from teuthology.util.version import LooseVersion
 
 log = logging.getLogger(__name__)
 

teuthology/task/install/rpm.py

@@ -2,14 +2,13 @@
 import os.path
 from io import StringIO
 
-from distutils.version import LooseVersion
-
 from teuthology.config import config as teuth_config
 from teuthology.contextutil import safe_while
 from teuthology.orchestra import run
 from teuthology import packaging
 
 from teuthology.task.install.util import _get_builder_project, _get_local_dir
+from teuthology.util.version import LooseVersion
 
 log = logging.getLogger(__name__)
 

teuthology/util/strtobool.py

@@ -0,0 +1,14 @@
+def strtobool(val):
+    """Convert a string representation of truth to true (1) or false (0).
+    
+    True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
+    are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
+    'val' is anything else.
+    """
+    val = val.lower()
+    if val in ('y', 'yes', 't', 'true', 'on', '1'):
+        return 1
+    elif val in ('n', 'no', 'f', 'false', 'off', '0'):
+        return 0
+    else:
+        raise ValueError(f"invalid truth value {val!r}")

teuthology/util/version.py

@@ -0,0 +1,49 @@
+import re
+from functools import total_ordering
+from typing import Union, List
+
+
+@total_ordering
+class LooseVersion:
+    """
+    A flexible version comparison class that handles arbitrary version strings.
+    Compares numeric components numerically and alphabetic components lexically.
+    """
+
+    _component_re = re.compile(r'(\d+|[a-z]+|\.)', re.IGNORECASE)
+
+    def __init__(self, vstring: str):
+        self.vstring = str(vstring)
+        self.version = self._parse(self.vstring)
+
+    def _parse(self, vstring: str) -> List[Union[int, str]]:
+        """Parse version string into comparable components."""
+        components = []
+        for match in self._component_re.finditer(vstring.lower()):
+            component = match.group()
+            if component != '.':
+                # Try to convert to int, fall back to string
+                try:
+                    components.append(int(component))
+                except ValueError:
+                    components.append(component)
+        return components
+
+    def __str__(self) -> str:
+        return self.vstring
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}('{self.vstring}')"
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, LooseVersion):
+            other = LooseVersion(str(other))
+        return self.version == other.version
+
+    def __lt__(self, other) -> bool:
+        if not isinstance(other, LooseVersion):
+            other = LooseVersion(str(other))
+        return self.version < other.version
+
+    def __hash__(self) -> int:
+        return hash(tuple(self.version))