diff mbox series

[layerindex-web,6/6] global: replace deprecated distutils

Message ID 125fe439624b307582389aad8c8a6b920bb6b2c8.1671208436.git.tim.orling@konsulko.com
State New
Headers show
Series [layerindex-web,1/6] Dockerfile: add captcha dependencies | expand

Commit Message

Tim Orling Dec. 16, 2022, 4:42 p.m. UTC
Replace distutils.version.LooseVersion with pkg_resource.parse_version

https://majornetwork.net/2021/05/comparing-version-numbers-in-python/

[YOCTO #14990]

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 layerindex/recipedesc.py               | 1 -
 layerindex/tools/import_classic.py     | 1 -
 layerindex/tools/import_otherdistro.py | 1 -
 layerindex/update.py                   | 4 ++--
 layerindex/update_layer.py             | 6 +++---
 layerindex/views.py                    | 6 ++----
 rrs/tools/upgrade_history_internal.py  | 4 ++--
 7 files changed, 9 insertions(+), 14 deletions(-)
diff mbox series

Patch

diff --git a/layerindex/recipedesc.py b/layerindex/recipedesc.py
index a844186..33aef31 100644
--- a/layerindex/recipedesc.py
+++ b/layerindex/recipedesc.py
@@ -13,7 +13,6 @@  import logging
 import subprocess
 from datetime import datetime
 import fnmatch
-from distutils.version import LooseVersion
 
 
 logger = None
diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py
index 0216221..44f8f88 100755
--- a/layerindex/tools/import_classic.py
+++ b/layerindex/tools/import_classic.py
@@ -22,7 +22,6 @@  import fnmatch
 import re
 import tempfile
 import shutil
-from distutils.version import LooseVersion
 import utils
 import recipeparse
 
diff --git a/layerindex/tools/import_otherdistro.py b/layerindex/tools/import_otherdistro.py
index 0c6640f..5c00115 100755
--- a/layerindex/tools/import_otherdistro.py
+++ b/layerindex/tools/import_otherdistro.py
@@ -23,7 +23,6 @@  import subprocess
 import string
 import shlex
 import codecs
-from distutils.version import LooseVersion
 
 sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '..')))
 sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), 'lib')))
diff --git a/layerindex/update.py b/layerindex/update.py
index 5a2642b..7de9c0d 100755
--- a/layerindex/update.py
+++ b/layerindex/update.py
@@ -17,7 +17,7 @@  import codecs
 import logging
 import subprocess
 from datetime import datetime, timedelta
-from distutils.version import LooseVersion
+from pkg_resources import parse_version
 import utils
 import operator
 import re
@@ -130,7 +130,7 @@  def extract_value(valuename, output):
         return ''
 
 def main():
-    if LooseVersion(git.__version__) < '0.3.1':
+    if parse_version(git.__version__) < parse_version('0.3.1'):
         logger.error("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script")
         sys.exit(1)
 
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index e8b210e..e0ecc94 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -19,7 +19,7 @@  import re
 import tempfile
 import shutil
 import errno
-from distutils.version import LooseVersion
+from pkg_resources import parse_version
 import itertools
 import utils
 import recipeparse
@@ -239,7 +239,7 @@  def update_distro_conf_file(path, distro, d):
         distro.description = desc
 
 def main():
-    if LooseVersion(git.__version__) < '0.3.1':
+    if parse_version(git.__version__) < parse_version('0.3.1'):
         logger.error("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script")
         sys.exit(1)
 
@@ -808,7 +808,7 @@  def main():
         logger.error(traceback.format_exc().rstrip())
         sys.exit(1)
     finally:
-        if tinfoil and (LooseVersion(bb.__version__) > LooseVersion("1.27")):
+        if tinfoil and (parse_version(bb.__version__) > parse_version("1.27")):
             tinfoil.shutdown()
 
     if tempdir:
diff --git a/layerindex/views.py b/layerindex/views.py
index 6f22c0c..e660578 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -41,7 +41,6 @@  from django.views.generic.base import RedirectView
 from django.views.generic.edit import (CreateView, DeleteView, FormView,
                                        UpdateView)
 from django_registration.backends.activation.views import RegistrationView
-from pkg_resources import parse_version
 from reversion.models import Revision
 
 import settings
@@ -1736,7 +1735,6 @@  class BranchCompareView(FormView):
     form_class = BranchComparisonForm
 
     def get_recipes(self, from_branch, to_branch, layer_ids):
-        from distutils.version import LooseVersion
         class BranchComparisonResult:
             def __init__(self, pn, short_desc):
                 self.pn = pn
@@ -1791,9 +1789,9 @@  class BranchCompareView(FormView):
         changed = []
         removed = []
         for _, recipe in sorted(recipes.items(), key=lambda item: item[0]):
-            recipe.from_versions = sorted(recipe.from_versions, key=lambda item: LooseVersion(item.pv))
+            recipe.from_versions = sorted(recipe.from_versions, key=lambda item: parse_version(item.pv))
             from_version_exprs = [x.version_expr() for x in recipe.from_versions]
-            recipe.to_versions = sorted(recipe.to_versions, key=lambda item: LooseVersion(item.pv))
+            recipe.to_versions = sorted(recipe.to_versions, key=lambda item: parser_version(item.pv))
             to_version_exprs = [x.version_expr() for x in recipe.to_versions]
             if not from_version_exprs:
                 added.append(recipe)
diff --git a/rrs/tools/upgrade_history_internal.py b/rrs/tools/upgrade_history_internal.py
index e3a96d9..2ba96b1 100644
--- a/rrs/tools/upgrade_history_internal.py
+++ b/rrs/tools/upgrade_history_internal.py
@@ -16,7 +16,7 @@  import os
 import optparse
 import logging
 import re
-from distutils.version import LooseVersion
+from pkg_resources import parse_version
 import git
 from datetime import datetime
 import calendar
@@ -561,7 +561,7 @@  def generate_history(options, layerbranch_id, commit, logger):
             pass
 
     finally:
-        if tinfoil and hasattr(tinfoil, 'shutdown') and (LooseVersion(bb.__version__) > LooseVersion("1.27")):
+        if tinfoil and hasattr(tinfoil, 'shutdown') and (parse_version(bb.__version__) > parse_version("1.27")):
             tinfoil.shutdown()
         utils.rmtree_force(tempdir)