test/internal: drop distutils usage

distutils will be removed in 3.12 and usage with 3.10 will lead to a
DeprecationWarning.
So replace the functionality following the migration advice from PEP 632.

Signed-off-by: Erik Larsson <[email protected]>

setup.cfg

@@ -27,10 +27,12 @@ setup_requires =
     pkgconfig
     cryptography>=3.0
     asn1crypto
+    packaging
 install_requires =
     cffi>=1.0.0
     asn1crypto
     cryptography>=3.0
+    packaging
 
 [options.extras_require]
 dev =

test/TSS2_BaseTest.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2
 
-from distutils import spawn
+import shutil
 import logging
 import os
 import random
@@ -154,7 +154,7 @@ class TpmSimulator(object):
     def getSimulator():
 
         for sim in TpmSimulator.SIMULATORS:
-            exe = spawn.find_executable(sim.exe)
+            exe = shutil.which(sim.exe)
             if not exe:
                 print(f'Could not find executable: "{sim.exe}"', file=sys.stderr)
                 continue

tpm2_pytss/internal/utils.py

@@ -2,7 +2,7 @@
 import logging
 import sys
 from typing import List
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 from .._libtpm2_pytss import ffi, lib
 from ..TSS2_Exception import TSS2_Exception
@@ -244,7 +244,12 @@ def _check_bug_fixed(
 def _lib_version_atleast(tss2_lib, version):
     if tss2_lib not in _versions:
         return False
-    libv = LooseVersion(_versions[tss2_lib])
-    lv = LooseVersion(version)
+    # Needed to remove git commit from version strings
+    lib_parts = _versions[tss2_lib].rsplit("-", 1)
+    fixed_lib_version = lib_parts[0]
+    version_parts = version.rsplit("-", 1)
+    fixed_version = version_parts[0]
+    libv = Version(fixed_lib_version)
+    lv = Version(fixed_version)
 
     return libv >= lv