Skip to content

Commit 52253b1

Browse files
fix: remove usage of pkg_resources (Azure#9600)
1 parent e953e9a commit 52253b1

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

scripts/ci/avail-ext-doc/update_extension_list.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import collections
1717
import datetime
18-
from pkg_resources import parse_version
18+
from packaging.version import Version
1919

2020
from jinja2 import Template # pylint: disable=import-error
2121
import requests
@@ -39,7 +39,7 @@ def get_extensions():
3939
index_extensions = collections.OrderedDict(sorted(get_index_data()['extensions'].items()))
4040
for _, exts in index_extensions.items():
4141
# Get latest version
42-
exts = sorted(exts, key=lambda c: parse_version(c['metadata']['version']), reverse=True)
42+
exts = sorted(exts, key=lambda c: Version(c['metadata']['version']), reverse=True)
4343

4444
# some extension modules may not include 'HISTORY.rst'
4545
# setup.py

scripts/ci/azdev_linter_style.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from subprocess import CalledProcessError, check_call, check_output
1818

1919
import service_name
20-
from pkg_resources import parse_version
20+
from packaging.version import Version
2121
from util import get_ext_metadata
2222

2323
logger = logging.getLogger(__name__)
@@ -210,7 +210,7 @@ def entry_equals_ignore_url(entry1, entry2):
210210

211211
separator_line()
212212

213-
latest_entry = max(modified_entries, key=lambda c: parse_version(c['metadata']['version']))
213+
latest_entry = max(modified_entries, key=lambda c: Version(c['metadata']['version']))
214214

215215
az_extension = AzExtensionHelper(name)
216216
az_extension.add_from_url(latest_entry['downloadUrl'])

scripts/ci/index_ref_doc.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
import unittest
1515
import shutil
1616
from subprocess import check_call, CalledProcessError
17-
from pkg_resources import parse_version, get_distribution
17+
from packaging.version import Version
18+
from importlib.metadata import version as get_version
1819

1920
from six import with_metaclass
2021

@@ -31,18 +32,18 @@
3132

3233
ALL_TESTS = []
3334

34-
CLI_VERSION = get_distribution('azure-cli').version
35+
CLI_VERSION = get_version('azure-cli')
3536

3637
for extension_name, exts in get_index_data()['extensions'].items():
37-
parsed_cli_version = parse_version(CLI_VERSION)
38+
parsed_cli_version = Version(CLI_VERSION)
3839
filtered_exts = []
3940
for ext in exts:
40-
if parsed_cli_version <= parse_version(ext['metadata'].get('azext.maxCliCoreVersion', CLI_VERSION)):
41+
if parsed_cli_version <= Version(ext['metadata'].get('azext.maxCliCoreVersion', CLI_VERSION)):
4142
filtered_exts.append(ext)
4243
if not filtered_exts:
4344
continue
4445

45-
candidates_sorted = sorted(filtered_exts, key=lambda c: parse_version(c['metadata']['version']), reverse=True)
46+
candidates_sorted = sorted(filtered_exts, key=lambda c: Version(c['metadata']['version']), reverse=True)
4647
chosen = candidates_sorted[0]
4748
ALL_TESTS.append((extension_name, chosen['downloadUrl'], chosen['filename']))
4849

0 commit comments

Comments
 (0)