From d6604d55d8bc31c7dc3b3ec56a4beae8b9e9e57d Mon Sep 17 00:00:00 2001 From: Jack Lloyd-Walters Date: Tue, 15 Aug 2023 20:54:41 +0100 Subject: [PATCH 1/3] switch to packagin.version --- maas/client/viscera/version.py | 4 ++-- scripts/check-imports | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maas/client/viscera/version.py b/maas/client/viscera/version.py index a3fe4262..185a4b36 100644 --- a/maas/client/viscera/version.py +++ b/maas/client/viscera/version.py @@ -2,13 +2,13 @@ __all__ = ["Version"] -from distutils.version import StrictVersion +from packaging.version import Version as PackagingVersion from . import Object, ObjectField, ObjectType def parse_version(version): - return StrictVersion(version).version + return PackagingVersion(version).release class VersionType(ObjectType): diff --git a/scripts/check-imports b/scripts/check-imports index daf072f1..c6cc3908 100755 --- a/scripts/check-imports +++ b/scripts/check-imports @@ -96,7 +96,6 @@ python_standard_libs = [ 'difflib', 'dircache', 'dis', - 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', @@ -203,6 +202,7 @@ python_standard_libs = [ 'optparse', 'os', 'ossaudiodev', + 'packaging', 'parser', 'pathlib', 'pdb', From e5c766102ee858ad48acf446af7f9feed45487d2 Mon Sep 17 00:00:00 2001 From: Jack Lloyd-Walters Date: Wed, 16 Aug 2023 11:52:32 +0100 Subject: [PATCH 2/3] add packaging to setuptools --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 6a6ac1ab..b48ec24c 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,7 @@ def read(filename): "colorclass >= 1.2.0", "macaroonbakery >= 1.1.3", "oauthlib >= 1.0.3", + "packaging >= 23.1", "pymongo >= 3.5.1", # for bson "pytz >= 2014.10", "PyYAML >= 3.11", From 2a69727ac979dec536770aefd1db776406cac5b9 Mon Sep 17 00:00:00 2001 From: Jack Lloyd-Walters Date: Thu, 17 Aug 2023 15:58:44 +0100 Subject: [PATCH 3/3] update version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b48ec24c..935c30cf 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def read(filename): "colorclass >= 1.2.0", "macaroonbakery >= 1.1.3", "oauthlib >= 1.0.3", - "packaging >= 23.1", + "packaging >= 21.3", "pymongo >= 3.5.1", # for bson "pytz >= 2014.10", "PyYAML >= 3.11",