@@ -17,7 +17,7 @@ import codecs
import logging
import subprocess
from datetime import datetime, timedelta
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
import utils
import operator
import re
@@ -19,7 +19,7 @@ import re
import tempfile
import shutil
import errno
-from pkg_resources import parse_version
+from packaging.version import parse_version
import itertools
import utils
import recipeparse
@@ -11,7 +11,7 @@ import sys
import re
from datetime import datetime
from itertools import islice
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
import reversion
from django import forms
@@ -16,7 +16,7 @@ import os
import optparse
import logging
import re
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
import git
from datetime import datetime
import calendar
Since we are only using parse_version for comparison (typically checking that we are greater than some minimum version for tool or package), we can use packaging.version.parse as if it was parse_version [YOCTO #15348] Signed-off-by: Tim Orling <tim.orling@konsulko.com> --- layerindex/update.py | 2 +- layerindex/update_layer.py | 2 +- layerindex/views.py | 2 +- rrs/tools/upgrade_history_internal.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)