From b69614167496b603f37da93ec8c938c26ce8f24f Mon Sep 17 00:00:00 2001 From: Jeremy Maitin-Shepard Date: Sat, 24 Sep 2022 14:59:33 -0700 Subject: [PATCH] Eliminate use of deprecated `distutils.version` module Since the recommended replacement, `packaging.version`, is not in the standard library, this commit instead just implements a simple version number comparison without any additional dependencies. --- bazelisk.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bazelisk.py b/bazelisk.py index 0e943235..af266891 100755 --- a/bazelisk.py +++ b/bazelisk.py @@ -17,7 +17,6 @@ import base64 from contextlib import closing -from distutils.version import LooseVersion import hashlib import json import netrc @@ -171,15 +170,18 @@ def read_remote_text_file(url): def get_version_history(bazelisk_directory): - ordered = sorted( + return sorted( ( - LooseVersion(release["tag_name"]) + release["tag_name"] for release in get_releases_json(bazelisk_directory) if not release["prerelease"] ), + # This only handles versions with numeric components, but that is fine + # since prerelease verisons have been excluded. + key=lambda version: tuple(int(component) + for component in version.split('.')), reverse=True, ) - return [str(v) for v in ordered] def resolve_latest_version(version_history, offset):