MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-05 13:14:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

global: replace deprecated distutils

Browse Source 
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>
This commit is contained in:
Tim Orling 2022-12-16 08:42:55 -08:00 committed by Tim Orling
parent 13c94088b4
commit 0cc6d8eb1f
7 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
layerindex/recipedesc.py
View File

@ -13,7 +13,6 @@ import logging
import subprocess import subprocess
from datetime import datetime from datetime import datetime
import fnmatch import fnmatch
from distutils.version import LooseVersion
logger = None logger = None

1
layerindex/tools/import_classic.py
View File

@ -22,7 +22,6 @@ import fnmatch
import re import re
import tempfile import tempfile
import shutil import shutil
from distutils.version import LooseVersion
import utils import utils
import recipeparse import recipeparse

1
layerindex/tools/import_otherdistro.py
View File

@ -23,7 +23,6 @@ import subprocess
import string import string
import shlex import shlex
import codecs 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__), '..')))
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), 'lib'))) sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), 'lib')))

4
layerindex/update.py
View File

@ -17,7 +17,7 @@ import codecs
import logging import logging
import subprocess import subprocess
from datetime import datetime, timedelta from datetime import datetime, timedelta
from distutils.version import LooseVersion from pkg_resources import parse_version
import utils import utils
import operator import operator
import re import re
@ -130,7 +130,7 @@ def extract_value(valuename, output):
return '' return ''
def main(): 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") 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) sys.exit(1)

6
layerindex/update_layer.py
View File

@ -19,7 +19,7 @@ import re
import tempfile import tempfile
import shutil import shutil
import errno import errno
from distutils.version import LooseVersion from pkg_resources import parse_version
import itertools import itertools
import utils import utils
import recipeparse import recipeparse
@ -239,7 +239,7 @@ def update_distro_conf_file(path, distro, d):
distro.description = desc distro.description = desc
def main(): 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") 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) sys.exit(1)
@ -808,7 +808,7 @@ def main():
logger.error(traceback.format_exc().rstrip()) logger.error(traceback.format_exc().rstrip())
sys.exit(1) sys.exit(1)
finally: finally:
if tinfoil and (LooseVersion(bb.__version__) > LooseVersion("1.27")): if tinfoil and (parse_version(bb.__version__) > parse_version("1.27")):
tinfoil.shutdown() tinfoil.shutdown()
if tempdir: if tempdir:

6
layerindex/views.py
View File

@ -41,7 +41,6 @@ from django.views.generic.base import RedirectView
from django.views.generic.edit import (CreateView, DeleteView, FormView, from django.views.generic.edit import (CreateView, DeleteView, FormView,
UpdateView) UpdateView)
from django_registration.backends.activation.views import RegistrationView from django_registration.backends.activation.views import RegistrationView
from pkg_resources import parse_version
from reversion.models import Revision from reversion.models import Revision
import settings import settings
@ -1736,7 +1735,6 @@ class BranchCompareView(FormView):
form_class = BranchComparisonForm form_class = BranchComparisonForm
def get_recipes(self, from_branch, to_branch, layer_ids): def get_recipes(self, from_branch, to_branch, layer_ids):
from distutils.version import LooseVersion
class BranchComparisonResult: class BranchComparisonResult:
def __init__(self, pn, short_desc): def __init__(self, pn, short_desc):
self.pn = pn self.pn = pn
@ -1791,9 +1789,9 @@ class BranchCompareView(FormView):
changed = [] changed = []
removed = [] removed = []
for _, recipe in sorted(recipes.items(), key=lambda item: item[0]): 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] 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] to_version_exprs = [x.version_expr() for x in recipe.to_versions]
if not from_version_exprs: if not from_version_exprs:
added.append(recipe) added.append(recipe)

4
rrs/tools/upgrade_history_internal.py
View File

@ -16,7 +16,7 @@ import os
import optparse import optparse
import logging import logging
import re import re
from distutils.version import LooseVersion from pkg_resources import parse_version
import git import git
from datetime import datetime from datetime import datetime
import calendar import calendar
@ -561,7 +561,7 @@ def generate_history(options, layerbranch_id, commit, logger):
pass pass
finally: 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() tinfoil.shutdown()
utils.rmtree_force(tempdir) utils.rmtree_force(tempdir)