Merge pull request #888 from hloeung/looseversion

Use looseversion in place of distutils
juju · Jun 20, 2024 · 1b2d4dc · 1b2d4dc
2 parents 3eb526e + 012b2d6
commit 1b2d4dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/charmhelpers/core/hookenv.py b/charmhelpers/core/hookenv.py
@@ -18,7 +18,10 @@
 #  Charm Helpers Developers <[email protected]>
 
 import copy
-from distutils.version import LooseVersion
+try:
+    from distutils.version import LooseVersion
+except ImportError:
+    from looseversion import LooseVersion
 from enum import Enum
 from functools import wraps
 from collections import namedtuple, UserDict

diff --git a/requirements.txt b/requirements.txt
@@ -12,3 +12,5 @@ Jinja2
 netaddr
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
+
+looseversion;python_version >= '3.12'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ Jinja2
		netaddr

		pbr!=2.1.0,>=2.0.0 # Apache-2.0

		looseversion;python_version >= '3.12'